Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/man-typo-2-0 into lp:ubuntuone-client/stable-2-0

  1. man-typo-2-0
  2. Merge into stable-2-0
Proposed by dobey on 2012-04-13
Status: Merged
Approved by: Roberto Alsina on 2012-04-13
Approved revision: 1147
Merged at revision: 1147
Proposed branch: lp:~dobey/ubuntuone-client/man-typo-2-0
Merge into: lp:ubuntuone-client/stable-2-0
Diff against target: 58 lines (+2/-19)
4 files modified
bin/u1sdtool (+1/-1)
docs/Makefile.am (+0/-1)
docs/man/u1sdtool.1 (+1/-1)
docs/man/ubuntuone-preferences.1 (+0/-16)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/man-typo-2-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-04-13 Approve on 2012-04-13
Review via email: mp+101935@code.launchpad.net

Commit Message

Fix the typo in the u1sdtool --list-shared help text and man page
Don't install the really old preferences man file we don't need

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/u1sdtool'
2--- bin/u1sdtool 2011-09-08 19:32:33 +0000
3+++ bin/u1sdtool 2012-04-13 16:57:21 +0000
4@@ -234,7 +234,7 @@
5 help="Share PATH to USER. ")
6 parser.add_option("", "--list-shared", dest="list_shared",
7 action="store_true",
8- help="List the shared path's/shares offered. ")
9+ help="List the shared paths/shares offered. ")
10 parser.add_option("", "--create-folder", dest="create_folder",
11 metavar="PATH",
12 help="Create user defined folder in the specified path")
13
14=== modified file 'docs/Makefile.am'
15--- docs/Makefile.am 2011-02-09 14:40:29 +0000
16+++ docs/Makefile.am 2012-04-13 16:57:21 +0000
17@@ -2,7 +2,6 @@
18
19 manfilesdir = $(mandir)/man1
20 manfiles_DATA = \
21- man/ubuntuone-preferences.1 \
22 man/u1sdtool.1
23
24 EXTRA_DIST=$(manfiles_DATA)
25
26=== modified file 'docs/man/u1sdtool.1'
27--- docs/man/u1sdtool.1 2011-07-02 22:37:52 +0000
28+++ docs/man/u1sdtool.1 2012-04-13 16:57:21 +0000
29@@ -131,7 +131,7 @@
30 .RE
31 .TP
32 \fB\-\-list-shared\fR
33-List the shared path's/shares offered.
34+List the shared paths/shares offered.
35 .TP
36 \fB\-\-create-folder\fR=\fIPATH\fR
37 Create user defined folder in the specified path
38
39=== removed file 'docs/man/ubuntuone-preferences.1'
40--- docs/man/ubuntuone-preferences.1 2010-02-04 23:47:35 +0000
41+++ docs/man/ubuntuone-preferences.1 1970-01-01 00:00:00 +0000
42@@ -1,16 +0,0 @@
43-.TH UBUNTUONE-CLIENT-PREFERENCES 1
44-
45-.SH NAME
46-ubuntuone-client-preferences \- A dialog for configuring Ubuntu One
47-
48-.SH SYNOPSYS
49-.B ubutuone-client-preferences
50-
51-.SH DESCRIPTION
52-This manual page briefly documents the
53-.BR ubuntuone-client-preferences
54-process, which provides a configuration dialog for configuring
55-Ubuntu One file sharing.
56-
57-.SH AUTHOR
58-This manual page was written by Rodney Dawes <rodney.dawes@canonical.com>

Subscribers

People subscribed via source and target branches

to all changes: