Merge branch 'master' of git.mcs.anl.gov:bcfg2

3 files changed, 20 insertions, 10 deletions

diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt
index 1e3c90156..db463b210 100644
--- a/doc/appendix/guides/centos.txt
+++ b/doc/appendix/guides/centos.txt
@@ -24,6 +24,13 @@ building Bcfg2 from source and making your own packages.
 Using EPEL
 ----------
 
+.. warning::
+
+    EPEL has outdated versions of the server package for centos5 and
+    earlier. This guide is intended to be used with versions 1.0.0 and
+    higher. Please consider building a newer RPM if you are following
+    this guide.
+
 Make sure EPEL_ is a valid repository on your server. The `instructions
 <http://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_ on how to do this
 basically say::
diff --git a/doc/server/bcfg2-info.txt b/doc/server/bcfg2-info.txt
index 35d176e96..201900ba9 100644
--- a/doc/server/bcfg2-info.txt
+++ b/doc/server/bcfg2-info.txt
@@ -19,7 +19,7 @@ plugins.
 Getting Started
 ===============
 
-First, fire up the bcfg2-info interpreter.
+First, fire up the ``bcfg2-info`` interpreter.
 
 .. code-block:: none
 
@@ -45,14 +45,13 @@ displayed. For example, after a change to a file in the repository:
 
 .. code-block:: none
 
-     >update
+     > update
      Handled 1 events in 0.001s
      > update
      >
 
 This explicit update process allows you to control the update process,
-as well as see the precise changes caused by repository
-modifications.
+as well as see the precise changes caused by repository modifications.
 
 ``bcfg2-info`` has several builtin commands that display the state of
 various internal server core state. These are most useful for
@@ -60,14 +59,18 @@ examining the state of client metadata, either for a single client, or
 for clients overall.
 
 **clients**
-     displays a list of clients, along with their profile groups
+     Displays a list of clients, along with their profile groups
 **groups**
-     displays a list of groups, the inheritance hierarchy, profile
+     Displays a list of groups, the inheritance hierarchy, profile
      status, and category name, if there is one.
 **showclient**
-     displays full metadata information for a client, including
+     Displays full metadata information for a client, including
      profile group, group memberships, bundle list, and any connector
      data, like Probe values or Property info.
+**config**
+     Displays the configuration of the Bcfg2 server. 
+
+To leave the interactive shell, just type ``quit`` or ``exit``.
 
 Debugging Configuration Rules
 =============================
diff --git a/doc/server/plugins/version/svn2.txt b/doc/server/plugins/version/svn2.txt
index 773f39f8c..021ae4fd2 100644
--- a/doc/server/plugins/version/svn2.txt
+++ b/doc/server/plugins/version/svn2.txt
@@ -8,14 +8,14 @@ Svn2
 
 The Svn2 plugin is useful if you would like to track changes to your
 bcfg2 repository using a `Subversion <http://subversion.tigris.org/>`_
-backend. It is a rewrite of the Svn plugin using the 
+backend. It is a rewrite of the Svn plugin using the
 `pysvn <http://pysvn.tigris.org/>`_ api.
 
 Currently, it enables you to get revision information out of your
 repository for reporting purposes. Once the plugin is enabled, every time
 a client checks in, it will include the current repository revision in
 the reports/statistics.  If any changes are made from the bcfg2-server,
-the plugin will commit them back into the repositroy.  For example, 
+the plugin will commit them back into the repositroy.  For example,
 ``/usr/sbin/bcfg2-admin pull client Path /some/file`` will update the
 servers repository and commit the changes into svn.
 
@@ -33,6 +33,6 @@ Auto Commit feautre
 Svn2 adds the ability to commit changes back into the repository.  In
 order for this feature to work the repository should already be under version
 control and the user the bcfg2-server runs as must be able to commit without
-any interaction.  For example, a file base repository url 
+any interaction.  For example, a file base repository url
 (``file:///path/to/repo``).