summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/server/admin/index.txt7
-rw-r--r--doc/server/configurationentries.txt8
-rw-r--r--doc/server/plugins/generators/nagiosgen.txt4
3 files changed, 13 insertions, 6 deletions
diff --git a/doc/server/admin/index.txt b/doc/server/admin/index.txt
index 43c71a933..d8fe07630 100644
--- a/doc/server/admin/index.txt
+++ b/doc/server/admin/index.txt
@@ -51,6 +51,13 @@ query
Query clients.
+The default result format is suitable for consumption by `pdsh`_.
+This example queries the server for all clients in the *ubuntu* group::
+
+ bcfg2-admin query g=ubuntu
+
+.. _pdsh: http://sourceforge.net/projects/pdsh/
+
snapshots
=========
diff --git a/doc/server/configurationentries.txt b/doc/server/configurationentries.txt
index af1140bab..ba727ee22 100644
--- a/doc/server/configurationentries.txt
+++ b/doc/server/configurationentries.txt
@@ -68,7 +68,10 @@ the *type* and any other necessary attributes in `Rules`_.
| hardlink | New | Create | name, to |
| | | hardlinks | |
+-------------+----------------------+-----------------+--------------------------+
-| ignore | New | Ignore files | name, to |
+| symlink | Replaces SymLink | SymLinks | name, to |
+| | entries | | |
++-------------+----------------------+-----------------+--------------------------+
+| ignore | New | Ignore files | name |
| | | that cause | |
| | | package | |
| | | verification | |
@@ -85,9 +88,6 @@ the *type* and any other necessary attributes in `Rules`_.
| | entries | POSIX entities | group, perms |
| | | | |
+-------------+----------------------+-----------------+--------------------------+
-| symlink | Replaces SymLink | SymLinks | name, to |
-| | entries | | |
-+-------------+----------------------+-----------------+--------------------------+
Keep in mind that permissions for files served up by Cfg/TGenshi/TCheetah
are still handled via the traditional mechanisms (info/:info/info.xml
diff --git a/doc/server/plugins/generators/nagiosgen.txt b/doc/server/plugins/generators/nagiosgen.txt
index 64b9c02fa..0ab2868e8 100644
--- a/doc/server/plugins/generators/nagiosgen.txt
+++ b/doc/server/plugins/generators/nagiosgen.txt
@@ -161,11 +161,11 @@ Assign clients to nagios groups in
<Bundle name='nagios'/>
</Group>
-Update nagios configuration file to use nagiosgen.cfg::
+Update nagios configuration file to use ``nagiosgen.cfg``::
cfg_file=/etc/nagios/nagiosgen.cfg
Note that some of these files are built on demand, each time a client
in group "nagios-server" checks in with the Bcfg2 server. Local nagios
-instances can be configured to use the !NagiosGen directory in the Bcfg2
+instances can be configured to use the NagiosGen directory in the Bcfg2
repository directly.