diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-11 15:46:09 -0500 |
| commit | e30c785c94c5aa399c44fff386fa2279f64f1acc (patch) | |
| tree | e72c636dcae00a6ea0c668cfbee7d3e6b4e6a3fe /doc | |
| parent | 7aa15c4c5507e311ff66264bc31e6758a80eb337 (diff) | |
| parent | 103b1b5198828876fa0684296900769018075f1b (diff) | |
| download | bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.gz bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.tar.bz2 bcfg2-e30c785c94c5aa399c44fff386fa2279f64f1acc.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Compare.py
src/lib/Bcfg2/Server/Admin/Snapshots.py
src/lib/Bcfg2/Server/MultiprocessingCore.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/sbin/bcfg2-crypt
src/sbin/bcfg2-reports
tools/upgrade/1.3/migrate_configs.py
tools/upgrade/1.3/migrate_perms_to_mode.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | doc/contents.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py index d1bb029d2..0e4009cd3 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -66,7 +66,7 @@ else: # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.2' +release = '1.3.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/contents.txt b/doc/contents.txt index 8af0d808a..8220d0d1d 100644 --- a/doc/contents.txt +++ b/doc/contents.txt @@ -7,7 +7,7 @@ Bcfg2 documentation |release| ============================= .. toctree:: - :maxdepth: 2 + :maxdepth: 3 introduction/index installation/index |