summaryrefslogtreecommitdiffstats
path: root/doc/client
diff options
context:
space:
mode:
authorspartanem <em@msu.edu>2010-03-13 14:23:40 -0500
committerspartanem <em@msu.edu>2010-03-13 14:23:40 -0500
commit7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef (patch)
tree4c298d53debaa15f41e6ed1688acc94991b2093a /doc/client
parent55de1ebdf9bbac6dd03cdb7765ffa5e408a27d16 (diff)
parent41858f6c26343684a827e4bf2ddae3d0dd58a1eb (diff)
downloadbcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.tar.gz
bcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.tar.bz2
bcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.zip
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'doc/client')
-rw-r--r--doc/client/tools/index.txt11
-rw-r--r--doc/client/tools/yumng.txt4
2 files changed, 11 insertions, 4 deletions
diff --git a/doc/client/tools/index.txt b/doc/client/tools/index.txt
index 9d560ff6e..6ae903c50 100644
--- a/doc/client/tools/index.txt
+++ b/doc/client/tools/index.txt
@@ -52,8 +52,8 @@ Tool to manage services (primarily on Redhat based distros).
.. note:: Start and stop are standard arguments, but the one for reload
isn't consistent across services. You can specify which argument
- to use with the `reload` property in Service tags. Example:
- `<Service name="ftp" reload="condrestart" status="on"
+ to use with the `restart` property in Service tags. Example:
+ `<Service name="ftp" restart="condrestart" status="on"
type="chkconfig">`
DebInit
@@ -132,6 +132,13 @@ SYSV
Handles System V Packaging format that is available on Solaris.
+Upstart
+-------
+
+Upstart service support. Uses `Upstart`_ to configure services.
+
+.. _Upstart: http://upstart.ubuntu.com/
+
Yum
---
diff --git a/doc/client/tools/yumng.txt b/doc/client/tools/yumng.txt
index 8e7ffa1eb..07706ad8b 100644
--- a/doc/client/tools/yumng.txt
+++ b/doc/client/tools/yumng.txt
@@ -433,7 +433,7 @@ Pkgmgr Configuration
--------------------
Also see the general :ref:`Pkgmgr <server-plugins-generators-pkgmgr>`
-and :ref:`unsorted-altsrc` pages.
+and :ref:`server-plugins-structures-altsrc` pages.
Package Tag (Old style)
^^^^^^^^^^^^^^^^^^^^^^^
@@ -588,7 +588,7 @@ The two utilities detailed below are provided in the tools directory of
the source tarball.
Also see the general :ref:`Pkgmgr <server-plugins-generators-pkgmgr>`
-and :ref:`unsorted-altsrc` pages.
+and :ref:`server-plugins-structures-altsrc` pages.
pkgmgr_gen.py
^^^^^^^^^^^^^