4 files changed, 26 insertions, 28 deletions
diff --git a/doc/client/metadata.txt b/doc/client/metadata.txt
index 27870ba9a..0dec5e3a7 100644
--- a/doc/client/metadata.txt
+++ b/doc/client/metadata.txt
@@ -1,4 +1,5 @@
 .. -*- mode: rst -*-
+.. vim: ft=rst
 
 .. _client-metadata:
 
@@ -24,12 +25,12 @@ interaction:
 This construction process spans several server plugins. The
 :ref:`server-plugins-grouping-metadata` is responsible for
 initial instance creation, including the client hostname,
-profile, and basic group memberships. After this initial creation,
-Connector plugins (such as :ref:`server-plugins-probes-index` or
-:ref:`server-plugins-connectors-properties`) can add additional group
-memberships for clients. These memberships are merged into the instance;
-that is, the new group memberships are treated as if they were included
-in groups.xml. If any of these groups are defined in groups.xml,
+profile, and basic group memberships. After this initial
+creation, Connector plugins (such as :ref:`server-plugins-probes`
+or :ref:`server-plugins-connectors-properties`) can add additional
+group memberships for clients. These memberships are merged into the
+instance; that is, the new group memberships are treated as if they were
+included in groups.xml. If any of these groups are defined in groups.xml,
 then groups included there are included in the ClientMetadata instance
 group list. At the end of this process, the ClientMetadata instance has
 its complete set of group memberships. At this point, each connector
diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 170b30b2e..93eb11925 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -133,8 +133,6 @@ RPM
 Executes RPM to manage packages on Redhat-based and similar systems.
 Consider using the :ref:`YUM <client-tools-yum>` tool instead if possible.
 
-Formerly called ``RPMng``, but was renamed for the 1.3 release.
-
 SMF
 ---
 
@@ -195,13 +193,5 @@ Upstart service support. Uses `Upstart`_ to configure services.
 YUM
 ---
 
-Handles RPMs using the YUM package manager. Renamed from ``YUMng`` for
-the 1.3 release.  See :ref:`client-tools-yum` for more details.
-
-YUM24
------
-
-.. warning:: Deprecated in favor of :ref:`YUM <client-tools-yum>`
-
-Handles RPMs using older versions of the YUM package manager.
-
+Handles RPMs using the YUM package manager. See
+:ref:`client-tools-yum` for more details.
diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index e5fdb1f39..52d07eb4f 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -28,18 +28,17 @@ so they can be centrally observed. Actions look like:
 Note that the status attribute tells the bcfg2 client to ignore
 return status, causing failures to still not be centrally reported. If
 central reporting of action failure is desired, set this attribute to
-'check'. Also note that Action entries included in Base will not be
-executed.
+'check'.
 
-Actions may be completely defined inside of a bundle with the use of 
-:ref:`server-configurationentries`, much like Packages, Services or Paths. 
-The Rules plugin can also bind these entries. For example to include the 
-above action in a bundle, first the Action entry must be included in the 
+Actions may be completely defined inside of a bundle with the use of
+:ref:`server-configurationentries`, much like Packages, Services or Paths.
+The Rules plugin can also bind these entries. For example to include the
+above action in a bundle, first the Action entry must be included in the
 bundle:
 
 .. code-block:: xml
 
-    <Bundle name='bundle_name'>
+    <Bundle>
       ...
       <Action name='action_name'/>
     </Bundle>
@@ -56,6 +55,16 @@ Then a corresponding entry must be included in the Rules directory, like:
 This allows different clients to get different actions as a part of the
 same bundle based on group membership.
 
+It is also possible to do this in one step in the bundle itself with a
+``BoundAction`` tag, e.g.:
+
+.. code-block:: xml
+
+    <Bundle>
+      <BoundAction timing='post' when='modified' name='action_name'
+                   command='/path/to/command arg1 arg2' status='ignore'/>
+    </Rules>
+
 Example Action (add APT keys)
 =============================
 
diff --git a/doc/client/tools/yum.txt b/doc/client/tools/yum.txt
index 47ef3d5e9..ed1a3d5fd 100644
--- a/doc/client/tools/yum.txt
+++ b/doc/client/tools/yum.txt
@@ -7,9 +7,7 @@ Bcfg2 RPM/YUM Client Drivers
 ============================
 
 The RPM and YUM client drivers provide client support for RPMs
-(installed directly from URLs) and Yum repositories.  These drivers
-were formerly called ``RPMng`` and ``YUMng``, respectively, but were
-renamed for Bcfg2 1.3.0.
+(installed directly from URLs) and Yum repositories.
 
 Features
 ========