From 9d6e6241954d001a5b49e4ea9a48c10e2a792958 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 10 Dec 2012 17:19:54 -0600
Subject: generate XML schema docs from XML schemas themselves

---
 doc/client/tools/actions.txt | 22 +++-------------------
 doc/client/tools/yum.txt     | 45 +++++++++-----------------------------------
 2 files changed, 12 insertions(+), 55 deletions(-)

(limited to 'doc/client/tools')

diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index 49488dfbe..81486ecd1 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -23,24 +23,7 @@ so they can be centrally observed. Actions look like:
             status='ignore|check'
             build='true|false'/>
 
-+-----------+------------------+-------------------------------------------+
-| Attribute | Values           | Meaning                                   |
-+===========+==================+===========================================+
-| timing    | pre, post, both  | When the action is run                    |
-+-----------+------------------+-------------------------------------------+
-| name      | freeform         | action name                               |
-+-----------+------------------+-------------------------------------------+
-| command   | freeform         | command text                              |
-+-----------+------------------+-------------------------------------------+
-| when      | always, modified | If the action is always run, or only when |
-|           |                  | a bundle should be or has been modified   |
-+-----------+------------------+-------------------------------------------+
-| status    | ignore, check    | If the return code of the action          |
-|           |                  | should be reported or not                 |
-+-----------+------------------+-------------------------------------------+
-| build     | true, false      | Also execute the action in build mode     |
-|           |                  | (default: true)                           |
-+-----------+------------------+-------------------------------------------+
+.. xml:type:: ActionType
 
 Note that the status attribute tells the bcfg2 client to ignore
 return status, causing failures to still not be centrally reported. If
@@ -65,7 +48,8 @@ Then a corresponding entry must be included in the Rules directory, like:
 .. code-block:: xml
 
     <Rules priority='0'>
-    <Action timing='post' when='modified' name='action_name' command='/path/to/command arg1 arg2' status='ignore'/>
+      <Action timing='post' when='modified' name='action_name'
+              command='/path/to/command arg1 arg2' status='ignore'/>
     </Rules>
 
 This allows different clients to get different actions as a part of the
diff --git a/doc/client/tools/yum.txt b/doc/client/tools/yum.txt
index 10c3cf725..47ef3d5e9 100644
--- a/doc/client/tools/yum.txt
+++ b/doc/client/tools/yum.txt
@@ -298,46 +298,19 @@ not in the clients configuration.
 Ignoring Files during Verification
 ----------------------------------
 
-Ignore Tag
-^^^^^^^^^^
-
-The Ignore tag in Pkgmgr is used to "mask out" individual files from
-the RPM verification. This is done by comparing the verification
-failure results with the Ignore tag name. If there is a match, that
-entry is not used by the client to determine if a package has failed
+The :ref:`path-ignore` Path tag is used to exempt individual files
+from the RPM verification. This is done by comparing the verification
+failure results with the ignore Path. If there is a match, that entry
+is not used by the client to determine if a package has failed
 verification.
 
-Ignore tag entries can be specified at both the Package level, in which
-case they apply to all Instances, and/or at the Instance level, in which
-case they only apply to that instance.
-
-Ignore tag entries are used by the RPM driver. They can be specified
-in both old and new style Pkgmgr files.
-
-The Ignore Tag supports the following attributes:
-
-+-----------+-------------+--------+
-| Attribute | Description | Values |
-+===========+=============+========+
-| name      | File name.  | String |
-+-----------+-------------+--------+
-
-Example
-
-.. code-block:: xml
-
-    <Package name='glibc' type='rpm'>
-        <Ignore name='/etc/rpc'/>
-        <Instance simplefile='glibc-2.3.4-2.25.x86_64.rpm' version='2.3.4' release='2.25' arch='x86_64'/>
-    </Package>
+Path ignore entries can be specified at both the Package level, in
+which case they apply to all Instances, and/or at the Instance level,
+in which case they only apply to that instance.
 
-POSIX 'ignore' Path entries
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+See :ref:`path-ignore` for more details.
 
-The YUM analog to the Ignore Tag used by RPM is the use of Path
-entries of type 'ignore'. The following shows an example for the
-centos-release package which doesn't verify if you remove the default
-repos and replace them with a custom repo.
+Example:
 
 .. code-block:: xml
 
-- 
cgit v1.2.3-1-g7c22