Merge lp:~noskcaj/testdrive/manpage-fix into lp:testdrive

Proposed by Jackson Doak
Status: Merged
Merged at revision: 420
Proposed branch: lp:~noskcaj/testdrive/manpage-fix
Merge into: lp:testdrive
Diff against target: 28 lines (+3/-3)
2 files modified
doc/testdrive.1 (+2/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/testdrive/manpage-fix
Reviewer Review Type Date Requested Status
testdrive Pending
Review via email: mp+177760@code.launchpad.net

Description of the change

I've fixed some minor bugs in the setup.py and manpage

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/testdrive.1'
2--- doc/testdrive.1 2013-07-15 22:37:05 +0000
3+++ doc/testdrive.1 2013-07-31 08:48:42 +0000
4@@ -12,9 +12,9 @@
5
6 \fB\-f FILE\fP - path to a configuration file to read
7
8-\fB\-l FLAVOR\fP - hardcode Ubuntu flavor to testdrive; can be [ubuntu | kubuntu | xubuntu | edubuntu | myhbuntu | ubuntustudio | lubuntu | cloud-server | ubuntukylin ]
9+\fB\-l FLAVOR\fP - hardcode Ubuntu flavor to testdrive; can be [ubuntu | kubuntu | xubuntu | edubuntu | mythbuntu | ubuntustudio | lubuntu | cloud-server | ubuntukylin ]
10
11-\fB\-p REPOSITORY\fP - select Ubuntu repositoru; can be [cdimage|releases|cloud-daily]
12+\fB\-p REPOSITORY\fP - select Ubuntu repository; can be [cdimage|releases|cloud-daily]
13
14 \fB\-r RELEASE\fP - hardcode Ubuntu release codename to testdrive
15
16
17=== modified file 'setup.py'
18--- setup.py 2012-04-21 02:05:42 +0000
19+++ setup.py 2013-07-31 08:48:42 +0000
20@@ -93,7 +93,7 @@
21
22 DistUtilsExtra.auto.setup(
23 name='testdrive',
24- version='3.10',
25+ version='3.22',
26 license='GPL-3',
27 author='Andres Rodriguez',
28 author_email='andreserl@ubuntu.com',

Subscribers

People subscribed via source and target branches