From d6f214ade0c3daa65dde0015ae87c4c2092cd633 Mon Sep 17 00:00:00 2001 From: Kyle Kelley Date: Thu, 21 Mar 2013 16:46:39 -0400 Subject: [PATCH] Grammar fix, added RabbitMQ to scenarios/client --- docs/scenarios/admin.rst | 2 +- docs/scenarios/cli.rst | 2 +- docs/scenarios/client.rst | 6 ++++++ docs/scenarios/db.rst | 3 +-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst index 042f703..3397d66 100644 --- a/docs/scenarios/admin.rst +++ b/docs/scenarios/admin.rst @@ -104,7 +104,7 @@ The following command lists all available minions running CentOS using the grain Salt also provides a state system. States can be used to configure the minion hosts. -For example, when a minion host is ordered to read the following state file, will install +For example, when a minion host is ordered to read the following state file, it will install and start the Apache server: .. code-block:: yaml diff --git a/docs/scenarios/cli.rst b/docs/scenarios/cli.rst index cea7a3f..bc952c7 100644 --- a/docs/scenarios/cli.rst +++ b/docs/scenarios/cli.rst @@ -6,4 +6,4 @@ Command Line Applications Clint ----- -.. todo:: Write about Clint \ No newline at end of file +.. todo:: Write about Clint diff --git a/docs/scenarios/client.rst b/docs/scenarios/client.rst index e2d8202..b9cd402 100644 --- a/docs/scenarios/client.rst +++ b/docs/scenarios/client.rst @@ -41,3 +41,9 @@ messaging library aimed at use in scalable distributed or concurrent applications. It provides a message queue, but unlike message-oriented middleware, a ØMQ system can run without a dedicated message broker. The library is designed to have a familiar socket-style API. + +RabbitMQ +-------- + +.. todo:: Write about RabbitMQ + diff --git a/docs/scenarios/db.rst b/docs/scenarios/db.rst index 4f03058..d3c398f 100644 --- a/docs/scenarios/db.rst +++ b/docs/scenarios/db.rst @@ -30,7 +30,6 @@ Django ORM The Django ORM is the interface used by `Django `_ to provide database access. -It's based on the idea of models, an abstraction that makes it easier to +It's based on the idea of `models `_, an abstraction that makes it easier to manipulate data in Python. -Documentation can be found `here `_ \ No newline at end of file