Merge lp:~skellat/xubuntu-docs/xubuntu-docs into lp:xubuntu-docs/raring

[Stephen Michael Kellat]

1. Added page discussing use of apt-offline
2. Made minor correction to indicate LTS to LTS upgrading
3. Made minor additions to guide-keeping-safe and command-line

[Pasi Lallinaho (knome)]

Approving, but would like a confirmation from Elizabeth before merging.

review: Approve

[Elizabeth K. Joseph (lyz)]

review: Approve

[lp:~skellat/xubuntu-docs/xubuntu-docs]

19. By Pasi Lallinaho on 2013-03-19

Merging Stephen's new page for offline package management and further language improvements

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-19 20:07:38 +0000
+++ debian/changelog	2013-03-19 21:47:20 +0000
@@ -2,6 +2,7 @@
 
   [ Stephen Michael Kellat ]
   * Bumping to raring
+  * Created initial page describing use of apt-offline and added additional clean-up
 
   [ Unit193 ]
   * Language clean up (make text en-US)

=== modified file 'desktop-guide/C/command-line.xml'
--- desktop-guide/C/command-line.xml	2013-03-16 22:36:28 +0000
+++ desktop-guide/C/command-line.xml	2013-03-19 21:47:20 +0000
@@ -29,7 +29,7 @@
 
 		<note><para>If the program you wish to run as an administrator is graphical, such as the <application>Mousepad</application> text editor, you should use the command <userinput>gksudo</userinput> instead of <application>sudo</application>, even if you are running the application from the command line.</para></note>
 
-		<warning><para>Be careful when using <application>sudo</application>; you might damage your system if you type the wrong command! As a general rule, only use sudo when absolutely necessary. When you use <application>sudo</application> from a terminal, be sure to close it when you have finished!</para></warning>
+		<warning><para>Be careful when using <application>sudo</application>; you might damage your system if you type the wrong command! As a general rule, only use sudo when absolutely necessary. When you use <application>sudo</application> from a terminal, be sure to either close it when you have finished or type <userinput>exit</userinput> to continue using that terminal with normal access powers.</para></warning>
 
 		<para>For more information on <application>sudo</application>, see the <ulink url="&communitywiki-sudo;">sudo page</ulink> on the Ubuntu community wiki.</para>
 	</section>

=== modified file 'desktop-guide/C/guide-keeping-safe.xml'
--- desktop-guide/C/guide-keeping-safe.xml	2013-03-16 22:36:28 +0000
+++ desktop-guide/C/guide-keeping-safe.xml	2013-03-19 21:47:20 +0000
@@ -148,7 +148,7 @@
 			are not limited to writable CDs and DVDs, external hard disks, USB
 			disks and other computers on the network.</para>
 		<para>A simple way of backing up your files is to manually copy them to a
-			safe location (see above) by using the File Browser. Alternatively, you
+			safe location (see above) by using the File Browser as well as the <application>file-roller</application> which lets you compress files and pack them together.  Alternatively, you
 			can use a dedicated backup application.</para>
 		<tip><para>There are numerous of dedicated backup applications available
 			in the <application>Ubuntu Software Center</application>, including

=== modified file 'desktop-guide/C/index.xml'
--- desktop-guide/C/index.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/index.xml	2013-03-19 21:47:20 +0000
@@ -43,6 +43,7 @@
 	<xi:include href="internet-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="printing-scanning.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="managing-applications.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include href="offline-packages.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="guide-keeping-safe.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="hardware-devices.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 	<xi:include href="administrative-tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

=== modified file 'desktop-guide/C/managing-applications.xml'
--- desktop-guide/C/managing-applications.xml	2013-03-19 20:07:38 +0000
+++ desktop-guide/C/managing-applications.xml	2013-03-19 21:47:20 +0000
@@ -113,11 +113,9 @@
 		<section id="applications-offline-installation">
 			<title>Helpful applications</title>
 
-			<para><application>APTonCD</application> can be used to create a CD that contains all the packages you have on your system, or it can create CDs with packages or entire repositories of your choice. In a package manager, such as <application>Ubuntu Software Center</application>, find the <application>APTonCD</application> package and install it. Further documentation on <application>APTonCD</application> can be found on the <ulink url="&aptoncd-web;">APTonCD website</ulink>.</para>
-
-			<para>If you have access to a second computer which does have internet access, you can use it along with <application>apt-offline</application> to download the necessary package information from the internet and then transfer that data to the disconnected computer. This is a multi-step process. More information on the procedure can be found on the <ulink url="&communitywiki-installing;">Ubuntu Community Help wiki</ulink>.</para>
-
-			<para><application>Keryx</application> is a portable, cross-platform package manager for APT-based (Ubuntu, Debian) systems. It provides a graphical interface for gathering updates, packages, and dependencies for offline computers. <application>Keryx</application> is free and open source. Read more about and download <application>Keryx</application> from the <ulink url="&keryx-web;">Keryx website</ulink>.</para>
+                        <para>If you have less than optimal Internet access, <application>apt-offline</application> allows you to use another computer with better access to download packages and check for package updates like security fixes.  The other computer can run Xubuntu, another flavor of Ubuntu, or Debian.  A graphical interface is available via <application>apt-offline-gui</application> that makes a complicated-looking process easy.  All you need is time, patience, and a portable USB storage device.  A usage example to learn more about this in <xref linkend="offline-packages"/>.
+
+                        <para><application>APTonCD</application> lets you copy from the set of packages already downloaded to somebody else's computer to install them to your own and vice versa. In a package manager, such as <application>Ubuntu Software Centre</application>, find the <application>APTonCD</application> package and install it. Further documentation on <application>APTonCD</application> can be found on the <ulink url="&aptoncd-web;">APTonCD website</ulink>.</para>
 		</section>
 	</section>
 

=== modified file 'desktop-guide/C/migrating-upgrading.xml'
--- desktop-guide/C/migrating-upgrading.xml	2013-03-16 22:36:28 +0000
+++ desktop-guide/C/migrating-upgrading.xml	2013-03-19 21:47:20 +0000
@@ -69,7 +69,7 @@
 
 			<para>Upgrades usually take a while to complete. Typically, around 700MB of packages must be downloaded and installed, although the actual figure will depend on how many packages are already installed on your computer.</para>
 
-			<para>You can only upgrade to the latest Xubuntu release if you are running the second most recent release. If you have an older release, you must upgrade to the next release after that, and so on until you are running the most recent version. For example, users of version 9.04 would first have to upgrade to version 9.10 before upgrading to version 10.04. An exception to this rule is with Long Term Support (LTS) releases. You can upgrade directly from the previous LTS release to the current release.</para>
+			<para>You can only upgrade to the latest Xubuntu release if you are running the second most recent release. If you have an older release, you must upgrade to the next release after that, and so on until you are running the most recent version. For example, users of version 9.04 would first have to upgrade to version 9.10 before upgrading to version 10.04. An exception to this rule is with Long Term Support (LTS) releases. You can upgrade directly from the previous LTS release to the current LTS release.</para>
 		</section>
 
 		<section id="upgrading-to-devel">

=== added file 'desktop-guide/C/offline-packages.xml'
--- desktop-guide/C/offline-packages.xml	1970-01-01 00:00:00 +0000
+++ desktop-guide/C/offline-packages.xml	2013-03-19 21:47:20 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % xubuntu-ent SYSTEM "../libs/xubuntu.ent">
+%xubuntu-ent;
+<!ENTITY % xinclude SYSTEM "../libs/xinclude.mod">
+%xinclude;
+<!ENTITY language "&EnglishAmerican;">
+<!ENTITY language "C">
+]>
+<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.  There are multiple steps involved in the process of doing this.  With a USB flash drive available to you, this can be managed.</para>
+
+	<section id="offline-repo-update">
+		<title>Updating Repositories</title>
+
+		<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 and/or security updates available to apply to your computer.  This also allows you to know if new software is available.</para>
+
+		<para>From your disconnected computer you enter this at the command line: <userinput>apt-offline set --update apt-offline.sig</userinput></para>
+
+		<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>apt-offline get --bundle bundle.zip apt-offline.sig</userinput>.  Once that command is done, you can remove the USB flash drive and take it back to the disconnected computer.</para>
+
+		<para>Back at the disconnected computer, insert the USB flash drive.  Assuming you have opened a terminal and have navigated to the directory on the flash drive containing the two files you then enter: <userinput>sudo apt-offline install bundle.zip</userinput>.  You will see some program output scroll by and once it completes your repositories will be updated.</para> 
+	</section>
+
+	<section id="other-apt-offline-actions">
+		<title>Other Actions</title>
+
+		<para>The graphical tool <application>apt-offline-gui</application> helps you walk through the process for installing applications and upgrading applications while following the same basic steps as shown above.</para>
+
+	</section>
+
+</chapter>