Merge lp:~coreygoldberg/autopilot/fix-docs-version into lp:~autopilot/autopilot/temp-dev

[Corey Goldberg]

update docs version number in sphinx config

fix to sphinx config for version number.

docs/conf.py contained:

 # The short X.Y version.
 version = '1.4

this is used as a fallback for the version number in the docs if a debian changelog is not present. The current AP docs in Utopic were generated and have '1.4' in them. This branch changes it to:

 # The short X.Y version.
 version = '1.5'

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6765
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7896

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-autopilot-temp-dev-ci/131/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-autolanding/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-autolanding/132
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-amd64-autolanding/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-autolanding/132
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-armhf-autolanding/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-autolanding/132
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-autopilot-temp-dev-utopic-i386-autolanding/132/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/208

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'docs/conf.py'
--- docs/conf.py	2014-04-30 21:39:57 +0000
+++ docs/conf.py	2014-05-29 13:42:02 +0000
@@ -75,7 +75,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4'
+version = '1.5'
 
 # The full version, including alpha/beta/rc tags.
 try: