diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-13 12:59:09 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-13 12:59:09 -0500 |
| commit | a2363eefd17ceb8a98206c465ca11d2889f72756 (patch) | |
| tree | 8503d1a1bb21787e8ef64a8f010257cf95ced309 /doc | |
| parent | 0e1c82b46dc2b78e14c4e5c9c3a1b7f239c0c672 (diff) | |
| parent | d50d8c1c176f88073387121adc0c340540bc833c (diff) | |
| download | bcfg2-a2363eefd17ceb8a98206c465ca11d2889f72756.tar.gz bcfg2-a2363eefd17ceb8a98206c465ca11d2889f72756.tar.bz2 bcfg2-a2363eefd17ceb8a98206c465ca11d2889f72756.zip | |
Merge pull request #199 from AlexanderS/fix-doc
Fix doc errors
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/getting_started/index.txt | 10 | ||||
| -rw-r--r-- | doc/man/bcfg2-server.txt | 24 | ||||
| -rw-r--r-- | doc/releases/index.txt | 5 | ||||
| -rw-r--r-- | doc/server/plugins/probes/index.txt | 2 |
4 files changed, 24 insertions, 17 deletions
diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt index 62e804553..f619447e2 100644 --- a/doc/getting_started/index.txt +++ b/doc/getting_started/index.txt @@ -255,6 +255,10 @@ Once you have the server setup, you may be interested in Platform-specific Quickstart Notes ================================== -* :ref:`appendix-guides-centos` -* :ref:`appendix-guides-ubuntu` -* :ref:`getting_started-macosx-notes` +.. toctree:: + :maxdepth: 1 + + CentOS </appendix/guides/centos> + Ubuntu </appendix/guides/ubuntu> + Gentoo </appendix/guides/gentoo> + Mac OS X <macosx/notes> diff --git a/doc/man/bcfg2-server.txt b/doc/man/bcfg2-server.txt index f85964ae7..33d0df6cf 100644 --- a/doc/man/bcfg2-server.txt +++ b/doc/man/bcfg2-server.txt @@ -22,18 +22,18 @@ configurations to clients based on the data in its repository. Options ------- --C configfile Specify alternate bcfg2.conf location. --D pidfile Daemonize, placing the program pid in *pidfile*. --E encoding Specify the encoding of config files. --Q path Specify the path to the server repository. --S server Manually specify the server location (as opposed to - using the value in bcfg2.conf). This should be in - the format "https://server:port" --d Enable debugging output. --v Run in verbose mode. --h Print usage information. ---ssl-key=key Specify the path to the SSL key. ---no-fam-blocking Synonym for fam_blocking = False in bcfg2.conf +-C configfile Specify alternate bcfg2.conf location. +-D pidfile Daemonize, placing the program pid in *pidfile*. +-E encoding Specify the encoding of config files. +-Q path Specify the path to the server repository. +-S server Manually specify the server location (as opposed to + using the value in bcfg2.conf). This should be in + the format "https://server:port" +-d Enable debugging output. +-v Run in verbose mode. +-h Print usage information. +--ssl-key=key Specify the path to the SSL key. +--no-fam-blocking Synonym for fam_blocking = False in bcfg2.conf See Also -------- diff --git a/doc/releases/index.txt b/doc/releases/index.txt index 42a2306f6..479aa19de 100644 --- a/doc/releases/index.txt +++ b/doc/releases/index.txt @@ -7,4 +7,7 @@ Release Announcements ===================== -.. include:: 1.3.4.txt +.. toctree:: + + 1.4.0pre1 + 1.3.4 diff --git a/doc/server/plugins/probes/index.txt b/doc/server/plugins/probes/index.txt index 091c85e63..434ce20a8 100644 --- a/doc/server/plugins/probes/index.txt +++ b/doc/server/plugins/probes/index.txt @@ -15,7 +15,7 @@ generate an `/etc/auto.master` autofs config file for each type. Here we will look at how to do this. Probes also allow dynamic group assignment for clients, see -:ref:`_server-plugins-probes-dynamic-groups`. +:ref:`server-plugins-probes-dynamic-groups`. First, create a ``Probes`` directory in our toplevel repository location:: |