Merge lp:~nskaggs/ubuntu-docviewer-app/add-jenkins-info into lp:ubuntu-docviewer-app

[Nicholas Skaggs]

add jenkins info and mp readme

add jenkins info and mp readme

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:312
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/229/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/698/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/229/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

=== modified file 'README-Mergeproposal.md'
--- README-Mergeproposal.md	2015-12-21 13:06:52 +0000
+++ README-Mergeproposal.md	2016-03-04 20:09:21 +0000
@@ -9,7 +9,7 @@
 *   Does the MP add/remove user visible strings? If Yes, has the pot file been
     updated?
 
-*   Does the MP change the UI? If Yes, has it been approved by design, or 
+*   Does the MP change the UI? If Yes, has it been approved by design, or
     discussed with some of the DocViewer developers?
 
 *   Did you perform an exploratory manual test run of your code change and any
@@ -30,3 +30,7 @@
 Note: As of wily 15.10, some autopilot tests are broken in trunk. As such autopilot failures
 can be excused until they are fixed in trunk.
 
+Jenkins
+=======
+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)
+