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
=== modified file 'docs/source/development.rst'
--- docs/source/development.rst 2012-08-20 14:54:00 +0000
+++ docs/source/development.rst 2012-09-14 18:44:19 +0000
@@ -12,7 +12,7 @@
12Provisionioning12Provisionioning
13---------------13---------------
1414
15Within the UATH code, provisioning machines is handled by subclasses of the15Within the UTAH code, provisioning machines is handled by subclasses of the
16:py:class:`.Machine` class.16:py:class:`.Machine` class.
1717
18Scripts should provision machines by creating an instance of a subclass of the18Scripts should provision machines by creating an instance of a subclass of the
@@ -21,7 +21,7 @@
21collision.21collision.
2222
23End users not writing scripts can provision machines automatically using23End users not writing scripts can provision machines automatically using
24scripts provided by the UATH package. Please see the main UATH page for that.24scripts provided by the UTAH package. Please see the main UTAH page for that.
2525
26UTAH Compatible Test Cases26UTAH Compatible Test Cases
27--------------------------27--------------------------
2828
=== modified file 'docs/source/introduction.rst'
--- docs/source/introduction.rst 2012-09-05 12:06:10 +0000
+++ docs/source/introduction.rst 2012-09-14 18:44:19 +0000
@@ -62,7 +62,7 @@
62by provisioning it with a particular provisioning method.62by provisioning it with a particular provisioning method.
6363
64**WARNING: Your machine will be modified, not to interfere with your current64**WARNING: Your machine will be modified, not to interfere with your current
65set-up or virtualised environment, so uath will create a new user called uath65set-up or virtualised environment, so UTAH will create a new user called utah
66with sudo privileges to run the tests and have an inventory of existing VMs66with sudo privileges to run the tests and have an inventory of existing VMs
67that you could be interested in for running tests.**67that you could be interested in for running tests.**
6868

Subscribers

People subscribed via source and target branches