Merge lp:~nuclearbob/utah/utah-in-docs into lp:utah

Proposed by Max Brustkern
Status: Rejected
Rejected by: Max Brustkern
Proposed branch: lp:~nuclearbob/utah/utah-in-docs
Merge into: lp:utah
Diff against target: 33 lines (+3/-3)
2 files modified
docs/source/development.rst (+2/-2)
docs/source/introduction.rst (+1/-1)
To merge this branch: bzr merge lp:~nuclearbob/utah/utah-in-docs
Reviewer Review Type Date Requested Status
UTAH Dev Pending
Review via email: mp+124495@code.launchpad.net

Description of the change

Brad pointed out that a couple of places in the documentation still refer to UATH. This should correct that.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Withdrawing to submit a new combined docs merge.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/source/development.rst'
2--- docs/source/development.rst 2012-08-20 14:54:00 +0000
3+++ docs/source/development.rst 2012-09-14 18:44:19 +0000
4@@ -12,7 +12,7 @@
5 Provisionioning
6 ---------------
7
8-Within the UATH code, provisioning machines is handled by subclasses of the
9+Within the UTAH code, provisioning machines is handled by subclasses of the
10 :py:class:`.Machine` class.
11
12 Scripts should provision machines by creating an instance of a subclass of the
13@@ -21,7 +21,7 @@
14 collision.
15
16 End users not writing scripts can provision machines automatically using
17-scripts provided by the UATH package. Please see the main UATH page for that.
18+scripts provided by the UTAH package. Please see the main UTAH page for that.
19
20 UTAH Compatible Test Cases
21 --------------------------
22
23=== modified file 'docs/source/introduction.rst'
24--- docs/source/introduction.rst 2012-09-05 12:06:10 +0000
25+++ docs/source/introduction.rst 2012-09-14 18:44:19 +0000
26@@ -62,7 +62,7 @@
27 by provisioning it with a particular provisioning method.
28
29 **WARNING: Your machine will be modified, not to interfere with your current
30-set-up or virtualised environment, so uath will create a new user called uath
31+set-up or virtualised environment, so UTAH will create a new user called utah
32 with sudo privileges to run the tests and have an inventory of existing VMs
33 that you could be interested in for running tests.**
34

Subscribers

People subscribed via source and target branches