MAAS

Merge lp:~rvb/maas/doc-version-1.6 into lp:~maas-committers/maas/trunk

  1. doc-version-1.6
  2. Merge into trunk
Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 2232
Proposed branch: lp:~rvb/maas/doc-version-1.6
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
docs/conf.py (+2/-2)
To merge this branch: bzr merge lp:~rvb/maas/doc-version-1.6
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+214423@code.launchpad.net

Commit message

Fix the version of the documentation in the trunk branch. 1.5 has been cut, trunk is now 1.6.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/conf.py'
--- docs/conf.py 2014-03-05 22:17:59 +0000
+++ docs/conf.py 2014-04-06 10:18:48 +0000
@@ -57,9 +57,9 @@
57# built documents.57# built documents.
58#58#
59# The short X.Y version.59# The short X.Y version.
60version = '1.5'60version = '1.6'
61# The full version, including alpha/beta/rc tags.61# The full version, including alpha/beta/rc tags.
62release = '1.5'62release = '1.6'
6363
64# The language for content autogenerated by Sphinx. Refer to documentation64# The language for content autogenerated by Sphinx. Refer to documentation
65# for a list of supported languages.65# for a list of supported languages.