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

[Thomi Richards]

Fix documentation next/prev links.

Fix documentation next/prev links.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:352
http://jenkins.qa.ubuntu.com/job/autopilot-ci/269/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-i386-ci/41

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/autopilot-ci/269/rebuild

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/trunk-fix-docs]

353. By Thomi Richards on 2013-10-14

Add search box back again.

[Christopher Lee (veebers)]

Looks good to me.

review: Approve

=== 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 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+    '**': ['localtoc.html', 'searchbox.html', 'relations.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

=== 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 @@
+Autopilot Documentation Front Page
+##################################
+
+.. toctree::
+	tutorial/tutorial
+	api/index
+	faq/faq
+	porting/porting
+	appendix/appendix