diff --git a/README.md b/README.md index 4b8f9cb167a9a51441fca0ceb38cebeb950e3878..c794a217d98e693ef865aad7677b78858999febd 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [MCollective](http://puppetlabs.com/mcollective) - Ruby framework to manage server orchestration, developed by Puppet labs. * [Overcast](http://andrewchilds.github.io/overcast/) - Deploy VMs across different cloud providers, and run commands and scripts across any or all of them in parallel via SSH. * [Rundeck](http://rundeck.org/) - Simple orchestration tool. -* [Salt](http://www.saltstack.com/) - It's written in Python. +* [Salt](http://www.saltstack.com/) - Automation, orchestration and configuration management tool using Python, YAML and ZeroMQ. ## Cloud Storage @@ -138,7 +138,7 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [Fabric](http://www.fabfile.org/) - Python library and cli tool for streamlining the use of SSH for application deployment or systems administration tasks. * [Pallet](http://palletops.com/) - Infrastructure definition, configuration and management via a Clojure DSL. * [Puppet](http://puppetlabs.com/) - It's written in Ruby and uses Puppet's declarative language or a Ruby DSL. -* [Salt](http://www.saltstack.com/) - It's written in Python. +* [Salt](http://www.saltstack.com/) - Automation, orchestration and configuration management tool using Python, YAML and ZeroMQ. * [Slaughter](http://steve.org.uk/Software/slaughter/) - It's written in Perl. ## Continuous Integration & Continuous Deployment @@ -483,7 +483,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v * [ikiwiki](http://ikiwiki.info/) - A wiki compiler. * [Mediawiki](http://www.mediawiki.org/wiki/MediaWiki) - Used to power Wikipedia. * [MoinMoin](http://moinmo.in/) - An advanced, easy to use and extensible WikiEngine with a large community of users. - * [ÅŒlelo Wiki](https://github.com/minad/olelo) - A a wiki that stores pages in a Git repository. +* [ÅŒlelo Wiki](https://github.com/minad/olelo) - A a wiki that stores pages in a Git repository. * [TiddlyWiki](http://tiddlywiki.com) - Complete interactive wiki in JavaScript. # Resources