Merge lp:~javier.collado/utah/bug1039555-client into lp:~utah/utah/bug1039555
Status: | Merged |
---|---|
Approved by: | Max Brustkern |
Approved revision: | 663 |
Merged at revision: | 660 |
Proposed branch: | lp:~javier.collado/utah/bug1039555-client |
Merge into: | lp:~utah/utah/bug1039555 |
Diff against target: |
144 lines (+47/-8) 8 files modified
Makefile (+5/-2) client-Makefile (+5/-2) client.py (+1/-1) debian/control (+1/-1) debian/utah-client.manpages (+1/-0) docs/source/conf.py (+1/-1) docs/source/man/utah.rst (+32/-0) utah_howto.txt (+1/-1) |
To merge this branch: | bzr merge lp:~javier.collado/utah/bug1039555-client |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Javier Collado (community) | Needs Resubmitting | ||
Review via email:
|
Description of the change
This merge contains the changes needed to generate a man page for the client.
Note that the merge is against a branch owned by the team (lp:~utah/utah/bug1039555) to handle all the changes for this bug. Hence, this branch doesn't attempt to fix the whole bug, but just a part of it which is the generation of the man page for the client.
Remaining changes:
- Set final text for the `utah` man page
- Generate man pages for the server scripts
- Set the final text for the server scripts
Every set of changes is expected to be handled in a different branch to be merged also against lp:~utah/utah/bug1039555. Once everything is in that branch, the merge against lp:utah/dev will be proposed.
I think "Ubuntu Automation Test Harness" should be "Ubuntu Test Automation Harness" or just "UTAH." UATH is the old version.