diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/_templates/indexsidebar.html | 11 | ||||
| -rw-r--r-- | doc/conf.py | 4 | ||||
| -rw-r--r-- | doc/server/plugins/connectors/templatehelper.txt | 6 | ||||
| -rw-r--r-- | doc/server/plugins/generators/packages.txt | 15 |
4 files changed, 20 insertions, 16 deletions
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html new file mode 100644 index 000000000..39916315d --- /dev/null +++ b/doc/_templates/indexsidebar.html @@ -0,0 +1,11 @@ +<!-- FIXME: Add download page with pdf/html/txt archives of these documents + <h3>Download</h3> + <p><a href="{{ pathto('download') }}">Download these documents</a></p> +--> + + <h3>Docs for other versions</h3> + <ul> + <li><a href="http://docs.bcfg2.org/1.1/">Bcfg2 1.1 (stable)</a></li> + <li><a href="http://docs.bcfg2.org/1.2/">Bcfg2 1.2 (stable)</a></li> + <li><a href="http://docs.bcfg2.org/dev/">Bcfg2 development documentation</a></li> + </ul> diff --git a/doc/conf.py b/doc/conf.py index 2d5be4e9e..5903b009a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -141,7 +141,9 @@ html_last_updated_fmt = '%b %d, %Y' #html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +html_sidebars = { + 'index': 'indexsidebar.html' +} # Additional templates that should be rendered to pages, maps page names to # template names. diff --git a/doc/server/plugins/connectors/templatehelper.txt b/doc/server/plugins/connectors/templatehelper.txt index 67219109f..24d7f18b5 100644 --- a/doc/server/plugins/connectors/templatehelper.txt +++ b/doc/server/plugins/connectors/templatehelper.txt @@ -20,13 +20,15 @@ Restart ``bcfg2-server``. Now, any ``.py`` file placed in ``/var/lib/bcfg2/TemplateHelper/`` will be read and added to matching client metadata objects. See -:ref:`Writing Helpers` below for more information on how to write -TemplateHelper scripts. +:ref:`writing-templatehelpers` below for more information on how to +write TemplateHelper scripts. TemplateHelper supports group- and host-specific helpers, so you could create, e.g., ``foo.py.G80_test`` to create a helper that only applied to machines in the group ``test``. +.. _writing-templatehelpers: + Writing Helpers =============== diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt index 2bc3dab31..855a3c51c 100644 --- a/doc/server/plugins/generators/packages.txt +++ b/doc/server/plugins/generators/packages.txt @@ -51,7 +51,7 @@ member clients. | Yum | yum | | +--------+----------+--------------+ -.. note:: +.. note:: .. versionadded:: 1.2.0 @@ -574,7 +574,7 @@ You can also view the sources applicable to a client:: Type: yum URL: http://mirror.example.com/centos-6-x86_64-updates GPG Key(s): http://mirror.example.com/centos-6-x86_64-updates/RPM-GPG-KEY-CentOS-6 - + Name: centos-6-x86_64-os Type: yum URL: http://mirror.example.com/centos-6-x86_64-os @@ -671,17 +671,6 @@ It understands the following directives: "/etc/pki/rpm-gpg". * ``version``: Set the version attribute used when binding Packages. Default is ``auto``. -* ``import_gpg_keys``: The RPM release of an RPM GPG key cannot be - reliably and automatically determined without importing the key into - the server's key chain. If ``import_gpg_keys`` is "false" (the - default), the release of automatically-generated RPM GPG key entries - in the specification will be set to "any", which disables - verification of the release. (Version will still be verified.) In - practice, this is unlikely to be an issue, as the RPM version of a - GPG key is the key's fingerprint, and collisions are rare. If you - do encounter a GPG key version collision, you will need to set this - to "true", whereupon Packages will import the keys into the server's - key chain. Python RPM libraries must be installed for this to work. [yum] section ------------- |