summaryrefslogtreecommitdiffstats
path: root/doc/client
diff options
context:
space:
mode:
Diffstat (limited to 'doc/client')
-rw-r--r--doc/client/index.txt21
-rw-r--r--doc/client/paranoid.txt4
2 files changed, 23 insertions, 2 deletions
diff --git a/doc/client/index.txt b/doc/client/index.txt
index d0e7bd9a6..e13d97ea8 100644
--- a/doc/client/index.txt
+++ b/doc/client/index.txt
@@ -22,6 +22,27 @@ architecture, as opposed to one with a smarter client, for a few reasons:
deployment engine that can be driven by anything that writes a
compatible configuration description.
+Overall client service mode
+---------------------------
+
+`New in version 1.0.0`
+
+Overall client service mode. Specified on the client using ``-s <service
+mode``.
+
+* default
+
+ * perform all service manipulations
+
+* disabled
+
+ * perform no service manipulations
+
+* build
+
+ * attempt to stop all services started
+ * deprecates/replaces -B
+
.. toctree::
:maxdepth: 2
diff --git a/doc/client/paranoid.txt b/doc/client/paranoid.txt
index 0dba89fd1..8f50c550d 100644
--- a/doc/client/paranoid.txt
+++ b/doc/client/paranoid.txt
@@ -26,7 +26,7 @@ How do I use it?
This will save a copy of the replaced file in ``/var/cache/bcfg2``,
but it'll be named as the path to the file with /'s replaced
-by _'s. For example, the old `/etc/hosts` will be named
+by _'s. For example, the old ``/etc/hosts`` will be named
``/var/cache/bcfg2/etc_hosts``.
Extra configuration
@@ -39,5 +39,5 @@ in 1.0. For the following section in bcfg2.conf::
path = /my/custom/backup/path
max_copies = 5
-You will have the file backups store in /my/custom/backup/path. This
+You will have the file backups store in ``/my/custom/backup/path``. This
will also keep the five most recent backups of files.