Merge lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/update-manager/fixes-bug-563640 into lp:update-manager

Proposed by No
Status: Merged
Merged at revision: 1886
Proposed branch: lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/update-manager/fixes-bug-563640
Merge into: lp:update-manager
Diff against target: 43 lines (+14/-2)
1 file modified
data/update-manager.8 (+14/-2)
To merge this branch: bzr merge lp:~11111nonononono-deactivatedaccount-deactivatedaccount-deactivatedaccount/update-manager/fixes-bug-563640
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+23464@code.launchpad.net

Description of the change

This fixes bug 563640.

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 'data/update-manager.8'
2--- data/update-manager.8 2008-02-01 16:14:23 +0000
3+++ data/update-manager.8 2010-04-15 09:03:22 +0000
4@@ -4,7 +4,7 @@
5 .\"
6 .\" First parameter, NAME, should be all caps
7 .\" other parameters are allowed: see man(7), man(1)
8-.TH UPDATE-MANAGER 8 "August 2, 2007"
9+.TH UPDATE-MANAGER 8 "April 15, 2010"
10 .\" Please adjust this date whenever revising the manpage.
11 .\"
12 .\" for manpage-specific macros, see man(7)
13@@ -27,6 +27,12 @@
14 \fB-h\fR, \fB\-\-help\fR
15 Show a similar help message
16 .TP
17+\fB-V\fR, \fB\-\-version\fR
18+Show version
19+.TP
20+\fB-\-data-dir=DATA_DIR\fR
21+Directory that contains the data files
22+.TP
23 \fB-c\fR, \fB\-\-check-dist-upgrades\fR
24 Check if a new distribution release is available
25 .TP
26@@ -34,10 +40,16 @@
27 Check if upgrading to the latest devel release is possible
28 .TP
29 \fB-p\fR, \fB\-\-proposed\fR
30-Try to run a dist-upgrade
31+Upgrade using the latest proposed version of the release upgrader
32+.TP
33+\fB-\-no-focus-on-map\fR
34+Do not focus on map when starting
35 .TP
36 \fB-\-dist-upgrade\fR
37 Try to run a dist-upgrade
38+.TP
39+\fB-s\fR, \fB\-\-sandbox\fR
40+Test upgrade with a sandbox aufs overlay
41
42 .SH ACTIONS PERFORMED DURING AN UPGRADE TO A NEW VERSION
43 * eventually reinstall the package ubuntu-desktop

Subscribers

People subscribed via source and target branches

to status/vote changes: