From c0b2afa6e86557d5d206a64bd886034f432eee8d Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 31 Oct 2012 12:46:21 -0400
Subject: removed deprecated tools: RPMng, YUM24, YUMng

---
 doc/client/tools.txt     | 14 ++------------
 doc/client/tools/yum.txt |  4 +---
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'doc/client')

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 1dbb33b1a..09ea76230 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
 ---
 
@@ -166,13 +164,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/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
 ========
-- 
cgit v1.2.3-1-g7c22


From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 doc/client/tools/actions.txt | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'doc/client')

diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index 81486ecd1..ffca8572e 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -31,14 +31,14 @@ central reporting of action failure is desired, set this attribute to
 'check'. Also note that Action entries included in Base will not be
 executed.
 
-Actions cannot be completely defined inside of a bundle; they are a bound
-entry, much like Packages, Services or Paths. The Rules plugin can bind
-these entries. For example to include the above action in a bundle,
-first the Action entry must be included in the bundle:
+Actions are not completely defined inside of a bundle; they are an
+abstract entry. The Rules plugin can 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>
@@ -55,6 +55,14 @@ 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.:
+
+    <Bundle>
+      <BoundAction timing='post' when='modified' name='action_name'
+                   command='/path/to/command arg1 arg2' status='ignore'/>
+    </Rules>
+
 Example Action (add APT keys)
 =============================
 
-- 
cgit v1.2.3-1-g7c22


From 76350ecc5f05ee5236dd98e37291061813b8e709 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Feb 2013 13:44:32 -0500
Subject: made Action entries in Independent structures run with when="always"

---
 doc/client/tools/actions.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'doc/client')

diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index ffca8572e..268fcc51d 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -28,8 +28,7 @@ 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 are not completely defined inside of a bundle; they are an
 abstract entry. The Rules plugin can bind these entries. For example
-- 
cgit v1.2.3-1-g7c22