Merge lp:~unit193/xubuntu-docs/fixes into lp:xubuntu-docs/trusty

Proposed by Unit 193
Status: Merged
Merged at revision: 99
Proposed branch: lp:~unit193/xubuntu-docs/fixes
Merge into: lp:xubuntu-docs/trusty
Diff against target: 29 lines (+2/-2)
2 files modified
desktop-guide/C/internet-networks.xml (+1/-1)
desktop-guide/C/offline-packages.xml (+1/-1)
To merge this branch: bzr merge lp:~unit193/xubuntu-docs/fixes
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+196787@code.launchpad.net

Description of the change

Fixes two occurrences of "the the", and removes the executable bit on 3 xml files.

To post a comment you must log in.
lp:~unit193/xubuntu-docs/fixes updated
98. By Pasi Lallinaho

Merging David's fixes.

99. By Pasi Lallinaho

Merging Unit193's changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktop-guide/C/guide-desktop.xml' (properties changed: +x to -x)
2=== modified file 'desktop-guide/C/internet-networks.xml'
3--- desktop-guide/C/internet-networks.xml 2013-10-11 18:00:20 +0000
4+++ desktop-guide/C/internet-networks.xml 2013-11-26 21:48:24 +0000
5@@ -147,7 +147,7 @@
6 <listitem><para><guilabel>CLAIMED</guilabel> indicates that a driver is loaded but not functioning. Continue to <xref linkend="network-troubleshooting-ndiswrapper" />.</para></listitem>
7 <listitem><para><guilabel>UNCLAIMED</guilabel> indicates that there is no driver loaded. Continue to <xref linkend="network-troubleshooting-ndiswrapper" />.</para></listitem>
8 <listitem><para><guilabel>ENABLED</guilabel> indicates that the driver is installed and working. Continue to section <xref linkend="network-troubleshooting-router" />.</para></listitem>
9- <listitem><para><guilabel>DISABLED</guilabel> indicates the the driver is installed, but disabled. Continue to <xref linkend="network-troubleshoothing-wifi-on" />.</para></listitem>
10+ <listitem><para><guilabel>DISABLED</guilabel> indicates the driver is installed, but disabled. Continue to <xref linkend="network-troubleshoothing-wifi-on" />.</para></listitem>
11 </itemizedlist>
12 </section>
13
14
15=== modified file 'desktop-guide/C/migrating-upgrading.xml' (properties changed: +x to -x)
16=== modified file 'desktop-guide/C/offline-packages.xml'
17--- desktop-guide/C/offline-packages.xml 2013-09-02 20:56:59 +0000
18+++ desktop-guide/C/offline-packages.xml 2013-11-26 21:48:24 +0000
19@@ -52,7 +52,7 @@
20
21 <para>This completes the first part to the process. You'll know now whether or not there are packages to upgrade. If there are packages to upgrade you can continue onward otherwise it is okay to stop.</para>
22
23- <para>Clear the USB flash drive that you have used previously. In a fresh terminal window, navigate to the directory on the USB flash drive you intend to work from. Since we never want to lose the opportunity to refresh the disconnected machine's view of the repositories, we build the the command to not only look for upgrade packages but also to update repositories. You will want to enter: <userinput>apt-offline set --update --upgrade apt-offline.sig</userinput></para>
24+ <para>Clear the USB flash drive that you have used previously. In a fresh terminal window, navigate to the directory on the USB flash drive you intend to work from. Since we never want to lose the opportunity to refresh the disconnected machine's view of the repositories, we build the command to not only look for upgrade packages but also to update repositories. You will want to enter: <userinput>apt-offline set --update --upgrade apt-offline.sig</userinput></para>
25
26 <para>After that command is done and the <userinput>apt-offline.sig</userinput> is created, copy that to your USB flash drive and take it to another computer. With apt-offline on that computer, you use that file to download what your disconnected computer needs to update itself. Assuming you are in the terminal and in the directory on the flash drive containing <userinput>apt-offline.sig</userinput>, you enter <userinput>sudo apt-offline get --bundle bundle.zip apt-offline.sig</userinput>. The command's output will show an attempt to download updates as to what the repositories look like as well as the upgrades as well as their dependencies that may be required by your system. Once that command is done, you can remove the USB flash drive and take it back to the disconnected computer. Some errors in red text may show up about being unable to download files relative to translations but these can be safely ignored.</para>
27
28
29=== modified file 'desktop-guide/C/what-is-xubuntu.xml' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches