Merge lp:~codehelp/lava-dispatcher/docs-location into lp:lava-dispatcher

Proposed by Neil Williams on 2013-09-11
Status: Merged
Approved by: Neil Williams on 2013-09-11
Approved revision: 680
Merged at revision: 681
Proposed branch: lp:~codehelp/lava-dispatcher/docs-location
Merge into: lp:lava-dispatcher
Diff against target: 47 lines (+10/-7)
3 files modified
doc/index.rst (+4/-3)
doc/standalonesetup.rst (+4/-3)
doc/usage.rst (+2/-1)
To merge this branch: bzr merge lp:~codehelp/lava-dispatcher/docs-location
Reviewer Review Type Date Requested Status
Antonio Terceiro 2013-09-11 Approve on 2013-09-11
Review via email: mp+184964@code.launchpad.net

Description of the change

Point at the generated docs now supported in lava-deployment-tool.

To post a comment you must log in.
680. By Neil Williams on 2013-09-11

Point local references to a local location instead of v.l.o

Antonio Terceiro (terceiro) wrote :

Looks good to me, let's go ahead with this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/index.rst'
2--- doc/index.rst 2013-09-06 10:52:02 +0000
3+++ doc/index.rst 2013-09-11 15:49:55 +0000
4@@ -18,10 +18,11 @@
5 ============
6
7 The best way to install this is by doing a full deployment of LAVA. This is
8-documented on our `main project page`_. However, you can also setup the
9-dispatcher for `stand-alone development and testing`_.
10+documented on our `main project page`_ or the Documentation link on any
11+LAVA instance. However, you can also setup the dispatcher for
12+`stand-alone development and testing`_.
13
14-.. _main project page: http://lava.readthedocs.org/en/latest/
15+.. _main project page: /static/docs/
16 .. _stand-alone development and testing: standalonesetup.html
17
18 Indices and tables
19
20=== modified file 'doc/standalonesetup.rst'
21--- doc/standalonesetup.rst 2012-10-10 19:29:04 +0000
22+++ doc/standalonesetup.rst 2013-09-11 15:49:55 +0000
23@@ -1,8 +1,9 @@
24 Quick Developer Setup
25 =====================
26-*NOTE:* You should most likely follow the normal installation instructions
27-defined at http://lava.readthedocs.org/en/latest. However, these steps can
28-get you a quick setup for local development on just the dispatcher::
29+
30+*NOTE:* You should most likely follow the `normal installation instructions </static/docs/deployment-tool.html>`_.
31+However, these steps can get you a quick setup for local development on
32+just the dispatcher::
33
34 # get code
35 $ sudo apt-get install python-virtualenv
36
37=== modified file 'doc/usage.rst'
38--- doc/usage.rst 2012-10-11 03:22:08 +0000
39+++ doc/usage.rst 2013-09-11 15:49:55 +0000
40@@ -29,5 +29,6 @@
41 The scheduler is useful for automating LAVA Dispatcher environment setup, describing test scenarios (the list of tests to invoke) and finally storing the results in the LAVA dashboard.
42
43 This scenario can be configured by following our `deployment instructions`_
44+or the Documentation link on any LAVA instance.
45
46-.. _deployment instructions: http://lava.readthedocs.org/en/latest/
47+.. _deployment instructions: /static/docs/

Subscribers

People subscribed via source and target branches