Ubuntu Documentation

Merge lp:~littlergirl/ubuntu-docs/saucy into lp:ubuntu-docs/saucy

  1. saucy
  2. Merge into saucy
Proposed by Little Girl
Status: Merged
Approved by: Doug Smythies
Approved revision: 252
Merged at revision: 247
Proposed branch: lp:~littlergirl/ubuntu-docs/saucy
Merge into: lp:ubuntu-docs/saucy
Diff against target: 134 lines (+31/-27)
4 files modified
ubuntu-help/C/a11y-screen-reader.page (+1/-1)
ubuntu-help/C/a11y-visualalert.page (+2/-2)
ubuntu-help/C/addremove-remove.page (+20/-16)
ubuntu-help/C/backup-where.page (+8/-8)
To merge this branch: bzr merge lp:~littlergirl/ubuntu-docs/saucy
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Kevin Godby Pending
Review via email: mp+185617@code.launchpad.net

Commit message

Multiple revisions that had been committed to the wrong branch.

Description of the change

I committed changes to my own branch instead of the lp:ubuntu-docs branch because I used an old command from when I didn't have direct commit privileges. I'm not certain how to fix it, so I'd rather propose all of these revisions for a merge than mess it up. Sorry about this mix-up! In future all my commits will go directly to the lp:ubuntu-docs branch. These are the changes that I made:

------------------------------------------------------------
revno: 247
author: Little Girl
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Fri 2013-09-13 22:49:07 -0400
message:
  * Added one word for a slight grammatical change.
------------------------------------------------------------
revno: 248
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Fri 2013-09-13 23:31:11 -0400
message:
  * Combined two sentences and removed excess information for simplicity and clarity.
------------------------------------------------------------
revno: 249
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Sat 2013-09-14 00:15:32 -0400
message:
  * Made change to satisfy bug #1225245.
------------------------------------------------------------
revno: 250
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Sat 2013-09-14 00:25:41 -0400
message:
  * Fixed some punctuation.
  * Rewrapped some text.
------------------------------------------------------------
revno: 251
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Sat 2013-09-14 00:41:19 -0400
message:
  * Reorganized list to satisfy bug #1225249.
------------------------------------------------------------
revno: 252
committer: Little Girl <email address hidden>
branch nick: saucy
timestamp: Sat 2013-09-14 00:55:38 -0400
message:
  * Grammar and punctuation fixes.
------------------------------------------------------------

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

This all looks good. I know you asked for Kevin, but if Kevin is not around, I'll take it and push it in a little bit.

Out of curiosity, some areas seem to change, but only in line length. I've seen that before. Is that some artifact of the editor you use? It makes it hard to know where to focus ones attention.

Revision history for this message
Little Girl (littlergirl) wrote :

Hey there,

Doug Smythies wrote:

> This all looks good. I know you asked for Kevin, but if Kevin is
> not around, I'll take it and push it in a little bit.

Oh, thank you so much! You're my hero!

> Out of curiosity, some areas seem to change, but only in line
> length. I've seen that before. Is that some artifact of the editor
> you use? It makes it hard to know where to focus ones attention.

In those I re-wrapped the text since the rest of the document was
wrapped and it wasn't. I'm using Kate to edit the files (I'm a
Kubuntu user).

Out of curiosity, will this merge become one big revision with
numerous changes, or will each of my commits be preserved?

Also, I used this command to grab a copy of the repository:

bzr branch lp:ubuntu-docs/saucy

I mistakenly used this command to push to the repository (since it's
what I used to use when I didn't have direct commit privileges):

bzr push lp:~littlergirl/ubuntu-docs/saucy

Should I use this?

bzr push lp:ubuntu-docs/saucy

Or this?

bzr push lp:ubuntu-docs

I want to get it right from now on. (:

--
Little Girl

There is no spoon.

Revision history for this message
Doug Smythies (dsmythies) wrote :

One big rev, I think, but we'll both know in a few minutes.

I'll use this: bzr push lp:ubuntu-docs but I think "bzr push lp:ubuntu-docs/saucy" would do the exact same thing.

review: Approve
Revision history for this message
Little Girl (littlergirl) wrote :

Hey there,

Doug Smythies wrote:

> Review: Approve

Thank you!

> One big rev, I think, but we'll both know in a few minutes.

Yep, it looks like one big revision. Ah, well, it won't happen again.
(:

> I'll use this: bzr push lp:ubuntu-docs but I think "bzr push
> lp:ubuntu-docs/saucy" would do the exact same thing.

I'll use what you use since it's working for you.

--
Little Girl

There is no spoon.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/a11y-screen-reader.page'
2--- ubuntu-help/C/a11y-screen-reader.page 2013-09-07 06:48:56 +0000
3+++ ubuntu-help/C/a11y-screen-reader.page 2013-09-14 05:43:33 +0000
4@@ -18,7 +18,7 @@
5
6 <p>GNOME provides the <app>Orca</app> screen reader to speak the user
7 interface. Depending on how you installed GNOME, you might not have
8- Orca installed. <link href="install:orca">Install Orca</link>, then
9+ Orca installed. <link href="install:orca">Install Orca</link>, and then
10 refer to the <link href="help:orca">Orca Help</link> for more
11 information.</p>
12
13
14=== modified file 'ubuntu-help/C/a11y-visualalert.page'
15--- ubuntu-help/C/a11y-visualalert.page 2013-09-13 01:47:40 +0000
16+++ ubuntu-help/C/a11y-visualalert.page 2013-09-14 05:43:33 +0000
17@@ -31,8 +31,8 @@
18 whenever the alert sound is played.</p>
19
20 <p>This can also be useful if you're in an environment where you need your
21- computer to be silent, such as in a library. See <link xref="sound-alert"/>
22- to learn how to mute the alert sound, then enable visual alerts.</p>
23+ computer to be silent, such as in a library (see <link xref="sound-alert"/>
24+ to learn how to mute the alert sound).</p>
25
26 <steps>
27 <item>
28
29=== modified file 'ubuntu-help/C/addremove-remove.page'
30--- ubuntu-help/C/addremove-remove.page 2013-09-07 08:45:27 +0000
31+++ ubuntu-help/C/addremove-remove.page 2013-09-14 05:43:33 +0000
32@@ -16,33 +16,37 @@
33
34 <title>Remove an application</title>
35
36- <p>The <app>Ubuntu Software Center</app> makes it easy to remove software that you no longer use.</p>
37+ <p>The <app>Ubuntu Software Center</app> makes it easy to remove
38+ software that you no longer use.</p>
39
40 <steps>
41 <item>
42- <p>Click the <app>Ubuntu Software Center</app> icon in the <gui>Launcher</gui>,
43- or search for <input>Software Center</input> in the <gui>Dash</gui>.</p>
44- </item>
45- <item>
46- <p>When the Software Center opens, click the <gui>Installed</gui> button at the top.</p>
47- </item>
48- <item>
49- <p>Find the application that you want to remove by using the search box, or
50- by looking through the list of installed applications.</p>
51+ <p>Click the <app>Ubuntu Software Center</app> icon in the
52+ <gui>Launcher</gui> or search for <input>Software Center</input>
53+ in the <gui>Dash</gui>.</p>
54+ </item>
55+ <item>
56+ <p>When the Software Center opens, click the <gui>Installed</gui>
57+ button at the top.</p>
58+ </item>
59+ <item>
60+ <p>Find the application that you want to remove by using the
61+ search box or by looking through the list of installed
62+ applications.</p>
63 </item>
64 <item>
65 <p>Select the application and click <gui>Remove</gui>.</p>
66 </item>
67 <item>
68- <p>You may be asked to enter your password. After you have done that, the application will be removed.</p>
69+ <p>You may be asked to enter your password. After you have
70+ done that, the application will be removed.</p>
71 </item>
72 </steps>
73 <note><p>
74- Some applications depend on others being installed in order to work
75- properly. If you try to remove an application which is needed by another
76- application, both of them will be removed. You will be asked
77- to confirm that this is what you want to happen before the applications
78- are removed.
79+ Some applications depend on other applications to work properly. If you
80+ try to remove an application that is needed by another application, both
81+ will be removed. You will be asked to confirm whether you want this to
82+ happen before the applications are removed.
83 </p></note>
84
85 </page>
86
87=== modified file 'ubuntu-help/C/backup-where.page'
88--- ubuntu-help/C/backup-where.page 2013-09-07 08:45:27 +0000
89+++ ubuntu-help/C/backup-where.page 2013-09-14 05:43:33 +0000
90@@ -29,7 +29,7 @@
91 keep the backup in the same building as your computer. If there is a fire or
92 theft, both copies of the data could be lost if they are kept together.</p>
93
94- <p>It is important to choose an appropriate <em>backup medium</em> too. You
95+ <p>It is important to choose an appropriate <em>backup medium</em>, too. You
96 need to store your backups on a device that has sufficient disk capacity for
97 all of the backed-up files.</p>
98
99@@ -39,21 +39,21 @@
100 <p>USB memory key (low capacity)</p>
101 </item>
102 <item>
103+ <p>Writable CDs or DVDs (low/medium capacity)</p>
104+ </item>
105+ <item>
106+ <p>External hard disk (typically high capacity)</p>
107+ </item>
108+ <item>
109 <p>Internal disk drive (high capacity)</p>
110 </item>
111 <item>
112- <p>External hard disk (typically high capacity)</p>
113- </item>
114- <item>
115 <p>Network-connected drive (high capacity)</p>
116 </item>
117 <item>
118 <p>File/backup server (high capacity)</p>
119 </item>
120 <item>
121- <p>Writable CDs or DVDs (low/medium capacity)</p>
122- </item>
123- <item>
124 <p>Online backup service (<link href = "http://aws.amazon.com/s3/">Amazon S3</link>
125 or <link href="https://one.ubuntu.com/">Ubuntu One</link>, for example; capacity
126 depends on price)</p>
127@@ -61,5 +61,5 @@
128 </list>
129
130 <p>Some of these options have sufficient capacity to allow for a backup of
131- every file on your system, also known as a <em>complete system backup</em>.</p>
132+ every file on your system, which is also known as a <em>complete system backup</em>.</p>
133 </page>
134\ No newline at end of file

Subscribers

People subscribed via source and target branches