Merge lp:~thomir-deactivatedaccount/autopilot/trunk-fix-docs into lp:autopilot

Proposed by Thomi Richards
Status: Merged
Approved by: Christopher Lee
Approved revision: 353
Merged at revision: 353
Proposed branch: lp:~thomir-deactivatedaccount/autopilot/trunk-fix-docs
Merge into: lp:autopilot
Diff against target: 28 lines (+12/-1)
2 files modified
docs/conf.py (+3/-1)
docs/index.rst (+9/-0)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/autopilot/trunk-fix-docs
Reviewer Review Type Date Requested Status
Christopher Lee (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+191043@code.launchpad.net

Commit message

Fix documentation next/prev links.

Description of the change

Fix documentation next/prev links.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
353. By Thomi Richards

Add search box back again.

Revision history for this message
Christopher Lee (veebers) wrote :

Looks good to me.

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 2013-09-25 21:29:42 +0000
+++ docs/conf.py 2013-10-14 21:02:10 +0000
@@ -166,7 +166,9 @@
166#html_use_smartypants = True166#html_use_smartypants = True
167167
168# Custom sidebar templates, maps document names to template names.168# Custom sidebar templates, maps document names to template names.
169#html_sidebars = {}169html_sidebars = {
170 '**': ['localtoc.html', 'searchbox.html', 'relations.html']
171}
170172
171# Additional templates that should be rendered to pages, maps page names to173# Additional templates that should be rendered to pages, maps page names to
172# template names.174# template names.
173175
=== modified file 'docs/index.rst'
--- docs/index.rst 2013-09-24 15:13:00 +0000
+++ docs/index.rst 2013-10-14 21:02:10 +0000
@@ -0,0 +1,9 @@
1Autopilot Documentation Front Page
2##################################
3
4.. toctree::
5 tutorial/tutorial
6 api/index
7 faq/faq
8 porting/porting
9 appendix/appendix

Subscribers

People subscribed via source and target branches