Ubuntu Documentation

Merge lp:~jan-simon/ubuntu-docs/typo-fix into lp:ubuntu-docs/precise

  1. typo-fix
  2. Merge into precise
Proposed by Jan Simon
Status: Merged
Merged at revision: 84
Proposed branch: lp:~jan-simon/ubuntu-docs/typo-fix
Merge into: lp:ubuntu-docs/precise
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntu-help/C/net-fixed-ip-address.page (+1/-1)
To merge this branch: bzr merge lp:~jan-simon/ubuntu-docs/typo-fix
Reviewer Review Type Date Requested Status
Connor Imes (community) Approve
Vikram Dhillon (community) Abstain
Review via email: mp+91172@code.launchpad.net

Description of the change

Typo: Added missing space

To post a comment you must log in.
Revision history for this message
Vikram Dhillon (dhillon-v10) wrote :

Thanks for submitting your patch, as this is a trivial fix and we have passed feature freeze we would want to hold on for the inclusion of this patch, as soon as our next branch opens up for development I will pull this in the main development branch.

review: Abstain
Revision history for this message
Matthew East (mdke) wrote :

Vikram,

That isn't correct. Feature freeze does not affect documentation and in any event this doesn't introduce a new feature. Documentation can be changed until the Documentation String Freeze on 22 March 2012.

Revision history for this message
Jan Simon (jan-simon) wrote :

It's actually quite confusing where to submit a patch, as there are lp:ubuntu/ubuntu-docs (where on other patch of mine was accepted) and lp:ubuntu-docs. I have found a few more trivial typos, but i'm unsure where to submit it.

Revision history for this message
Jeremy Bícha (jbicha) wrote :

lp:ubuntu-docs is the correct branch to merge against.

Revision history for this message
Connor Imes (ckimes) wrote :

Thanks, this has now been merged. Had to deconflict with Jeremy's rev 76.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/net-fixed-ip-address.page'
2--- ubuntu-help/C/net-fixed-ip-address.page 2011-09-09 04:53:59 +0000
3+++ ubuntu-help/C/net-fixed-ip-address.page 2012-02-01 21:43:20 +0000
4@@ -21,7 +21,7 @@
5
6 <steps>
7 <item><p>Click the <gui>network menu</gui> on the top panel and select <gui>Edit Connections</gui>.</p></item>
8-<item><p>Select the Auto eth connection on the <gui>Wired</gui>tab or your WiFi network on the <gui>Wireless</gui> tab and click <gui>Edit</gui>.</p></item>
9+<item><p>Select the Auto eth connection on the <gui>Wired</gui> tab or your WiFi network on the <gui>Wireless</gui> tab and click <gui>Edit</gui>.</p></item>
10 <item><p>Click on the <gui>IPv4 Settings</gui> tab and change the <gui>Method</gui> to <em>Manual</em>.</p></item>
11 <item><p>If no connection information is listed in the <gui>Addresses</gui> list, or if you want to set up a new connection, click <gui>Add</gui>.</p></item>
12 <item><p>Enter the <em>IP Address</em>, <em>Netmask</em>, and <em>Gateway</em> information into the appropriate boxes. How you choose these will depend on your network setup; there are specific rules governing which IP addresses and netmasks are valid for a given network.</p></item>

Subscribers

People subscribed via source and target branches