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

Proposed by Thomi Richards on 2013-10-14
Status: Merged
Approved by: Christopher Lee on 2013-10-14
Approved revision: 353
Merged at revision: 353
Proposed branch: lp:~thomir/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/autopilot/trunk-fix-docs
Reviewer Review Type Date Requested Status
Christopher Lee (community) 2013-10-14 Approve on 2013-10-14
PS Jenkins bot continuous-integration Approve on 2013-10-14
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.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~thomir/autopilot/trunk-fix-docs updated on 2013-10-14
353. By Thomi Richards on 2013-10-14

Add search box back again.

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
1=== modified file 'docs/conf.py'
2--- docs/conf.py 2013-09-25 21:29:42 +0000
3+++ docs/conf.py 2013-10-14 21:02:10 +0000
4@@ -166,7 +166,9 @@
5 #html_use_smartypants = True
6
7 # Custom sidebar templates, maps document names to template names.
8-#html_sidebars = {}
9+html_sidebars = {
10+ '**': ['localtoc.html', 'searchbox.html', 'relations.html']
11+}
12
13 # Additional templates that should be rendered to pages, maps page names to
14 # template names.
15
16=== modified file 'docs/index.rst'
17--- docs/index.rst 2013-09-24 15:13:00 +0000
18+++ docs/index.rst 2013-10-14 21:02:10 +0000
19@@ -0,0 +1,9 @@
20+Autopilot Documentation Front Page
21+##################################
22+
23+.. toctree::
24+ tutorial/tutorial
25+ api/index
26+ faq/faq
27+ porting/porting
28+ appendix/appendix

Subscribers

People subscribed via source and target branches