Merge lp:~flocculant/xubuntu-docs/updates into lp:xubuntu-docs/xenial

[Kev Bowring]

QA Team page - linked to our bzr page instead of ubuntu wiki page.

Offline - further changes to wording, removed copied repo update in last section and linked to the earlier section instead.

[Kev Bowring (flocculant)]

also removed a load of <userinput>'s that were highlighting a file name - left one in each section

[Pasi Lallinaho (knome)]

review: Approve

=== modified file 'contributor-docs/C/qa-team.xml'
--- contributor-docs/C/qa-team.xml	2015-11-09 23:47:40 +0000
+++ contributor-docs/C/qa-team.xml	2015-11-12 10:13:18 +0000
@@ -86,7 +86,7 @@
 		</itemizedlist>
 		</para>
 
-		<para>Once you've pushed to your local branch, you need to finally propose the change for merging. Detailed information on that, and the above can be found at the Ubuntu QA Team <ulink url="https://wiki.ubuntu.com/QATeam/DevelopmentToolsUsage">Bzr</ulink> page.</para>
+		<para>Once you've pushed to your local branch, propose the change for merging, <xref linkend="bzr-merge-proposal"></xref></para>
 		<para>Respond to any requests for changes when asked by the Testcase Admins in order to get the required change through in a timely manner.</para>
 	</section>
 

=== modified file 'desktop-guide/C/offline-packages.xml'
--- desktop-guide/C/offline-packages.xml	2015-11-01 21:05:07 +0000
+++ desktop-guide/C/offline-packages.xml	2015-11-12 10:13:18 +0000
@@ -13,9 +13,9 @@
 <chapter id="offline-packages">
 	<title>Offline Package Management</title>
 
-	<para>The tool <application>apt-offline</application> is available to help keep your computer up to date even if it cannot be kept connected by using a second internet connected computer, this other computer can run Xubuntu, another flavor of Ubuntu, or Debian. A graphical interface is available via <application>apt-offline-gui</application>. There are multiple steps involved in the process of doing this. </para>
+	<para>The tool <application>apt-offline</application> is available to help keep your computer up to date even if it cannot be kept connected by using a second internet connected computer, this other computer can run Xubuntu, another flavor of Ubuntu, or Debian. A graphical interface is available via <application>apt-offline-gui</application>. This document deals with the command line variant.</para>
 	
-	<para>Throughout this chapter directions to use a directory on a USB flashdrive are given, the naming and path to this directory is for you to decide beforehand</para>
+	<para>Throughout this chapter directions to use a directory on a USB flashdrive are given, the naming and path to this directory is for you to decide beforehand.</para>
 
 		<warning><para>A few specific packages are not built to handle the disconnected environment, due to them running download scripts during the installation or upgrade process.  Some packages that routinely exhibit this behavior are <application>flashplugin-installer</application>, <application>nautilus-dropbox</application>, and <application>ttf-mscorefonts-installer</application>.  There is no work-around for installation packages that themselves make downloads.</para></warning>
 
@@ -28,9 +28,9 @@
 
 		<para>After plugging in a USB flash drive and opening a terminal, you can use apt-offline to generate a request to update what your computer knows about software repositories.  This allows your computer to see if there are bug fixes, security updates or new software available for your computer.</para>
 
-		<para>From your disconnected computer you enter this at the command line: <userinput>apt-offline set --update apt-offline.sig</userinput></para>
+		<para>From your disconnected computer run: <userinput>apt-offline set --update apt-offline.sig</userinput></para>
 
-		<para>Once done, copy <userinput>apt-offline.sig</userinput> to your USB flash drive and take it to another computer.  With apt-offline on that computer, use that file to download what your disconnected computer needs to update itself. Navigate to the directory on the flash drive containing <userinput>apt-offline.sig</userinput>, enter <userinput>apt-offline get --bundle bundle.zip apt-offline.sig</userinput>.  Once done, you can remove the USB flash drive and take it back to the disconnected computer.</para>
+		<para>Once done, copy <emphasis>apt-offline.sig</emphasis> to your USB flash drive and take it to another computer.  With apt-offline on that computer, use that file to download what your disconnected computer needs to update itself. Navigate to the directory on the flash drive containing apt-offline.sig, enter <userinput>apt-offline get --bundle bundle.zip apt-offline.sig</userinput>.  When complete remove the USB flash drive and take it back to the disconnected computer.</para>
 
 		<para>At the disconnected computer, re-insert the USB flash drive. Navigate to the directory on the flash drive containing the two files, then enter: <userinput>sudo apt-offline install bundle.zip</userinput>. Once the command completes your repositories will be updated.</para> 
 	</section>
@@ -40,9 +40,9 @@
 
 		<para>You can use apt-offline to download a package to install. This action can also be combined with updating the software repositories. In a disconnected environment, using opportunities to connect efficiently is key.</para>
 
-		<para>In this example, we assume you want to install a new program package.  Throughout this we'll refer to this as <userinput>PACKAGENAME</userinput> though in normal use you will want to enter just the package name. Fairly frequently installing <userinput>PACKAGENAME</userinput> will result in the need to also grab dependencies.  <application>apt-offline</application> handles the dependency resolution for you.  To start this process open a terminal window, plug in a USB flash drive, and navigate to the directory.  From that directory enter : <userinput>sudo apt-offline set --install-packages $PACKAGENAME --update apt-offline.sig</userinput>to start the process</para>
+		<para>In this example, we assume you want to install a new program package.  Throughout this we'll refer to this as <emphasis>PACKAGENAME</emphasis> though in normal use you will want to enter just the package name. Fairly frequently, installing a package will require you to install dependencies.  <application>apt-offline</application> handles the dependency resolution for you.  To start this process open a terminal window, plug in a USB flash drive, and navigate to the directory.  From that directory run <userinput>sudo apt-offline set --install-packages $PACKAGENAME --update apt-offline.sig</userinput>to start the process</para>
 
-		<para>Once done, copy <userinput>apt-offline.sig</userinput> to your USB flash drive and take it to another computer.  With apt-offline on that computer, use that file to download what your disconnected computer needs to update and install <userinput>PACKAGENAME</userinput>. Navigate to the directory on the flash drive containing <userinput>apt-offline.sig</userinput>, 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 <application>PACKAGENAME</application> and dependencies your system requires.  Once done, remove the USB flash drive and take it back to the disconnected computer.</para>
+		<para>When complete, copy <emphasis>apt-offline.sig</emphasis> to your USB flash drive and take it to another computer.  With apt-offline on that computer, use that file to download what your disconnected computer needs to update and install PACKAGENAME. Navigate to the directory on the flash drive containing apt-offline.sig, run <userinput>sudo apt-offline get --bundle bundle.zip apt-offline.sig</userinput>.  The output will show an attempt to download repository updates as well as <application>PACKAGENAME</application> and any dependencies your system requires.  Remove the USB flash drive when complete and take it back to the disconnected computer.</para>
 
 		<para>At the disconnected computer, insert the USB flash drive. Navigate to the directory on the flash drive containing the two files then enter: <userinput>sudo apt-offline install bundle.zip</userinput>. Once it completes your repositories will be updated.  Once that completes, you can then install <application>PACKAGENAME</application> by then entering: <userinput>sudo apt-get install PACKAGENAME</userinput>.</para> 
 	</section>
@@ -50,19 +50,13 @@
 	<section id="offline-system-upgrade">
 		<title>Upgrading Your System</title>
 
-		<para>Upgrading packages takes 2 seperate stages, updating repositories and then the download and upgrade as required</para>
-
-		<para>First plug in a USB flash drive and open a terminal.  On your disconnected computer enter this at the command line: <userinput>apt-offline set --update apt-offline.sig</userinput></para>
-
-		<para>Once done, copy <userinput>apt-offline.sig</userinput> to your USB flash drive and take it to another computer.  With apt-offline on that computer, navigate to the directory on the flash drive and enter <userinput>apt-offline get --bundle bundle.zip apt-offline.sig</userinput>. Once done, remove the USB flash drive and re-insert it on the disconnected computer.</para>
-
-		<para>Navigate to the directory on the flash drive containing the two files and enter: <userinput>sudo apt-offline install bundle.zip</userinput>. Once finished your repositories will be updated.</para> 
-
-		<para>This completes the first part to the process. If there are packages to upgrade you can continue otherwise, stop.</para> 
-
-		<para>Clear the <emphasis>directory</emphasis> on 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 can build the command to not only look for upgrade packages but also to update repositories. Enter <userinput>apt-offline set --update --upgrade apt-offline.sig</userinput></para> 
-
-		<para>Once done, copy <userinput>apt-offline.sig</userinput> 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 upgrade itself. Navigate to the directory on the flash drive containing <userinput>apt-offline.sig</userinput>, 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 and the dependencies that may be required by your system.  Once done, remove the USB flash drive and take it back to the disconnected computer.</para>
+		<para>Upgrading packages requires 2 stages: updating repositories and then the download and upgrade as required</para>
+
+		<para>First update your repositories following the instructions in <xref linkend="offline-repo-update"></xref></para> 
+
+		<para>Clear the directory on 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 can build the command to not only look for upgrade packages but also to update repositories. Enter <userinput>apt-offline set --update --upgrade apt-offline.sig</userinput></para> 
+
+		<para>Once done, copy <emphasis>apt-offline.sig</emphasis> 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 upgrade itself. Navigate to the directory on the flash drive containing apt-offline.sig, run <userinput>sudo apt-offline get --bundle bundle.zip apt-offline.sig</userinput>.  The output will show an attempt to download repository updates as well as any upgrades and dependencies required by your system.  Once done, remove the USB flash drive and take it back to the disconnected computer.</para>
 
 		<para>At the disconnected computer, insert the USB flash drive navigate to the directory on the flash drive containing the two files, enter <userinput>sudo apt-offline install bundle.zip</userinput>.  Once it completes your repositories will be updated, you can then install the upgrades by entering: <userinput>sudo apt-get upgrade</userinput>.</para>