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

[Pasi Lallinaho]

1. Debian control bump
2. Add link to usage example for apt-offline
3. Remove Keryx from managing applications
4. Re-order helpful applications under managing applications
5. Bump variables in the DocBook stuff to 13.04
6. Modified apt-offline language

[Pasi Lallinaho (knome)]

Looks good to me.

review: Approve

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

17. By Pasi Lallinaho on 2013-03-19

Merging Stephen's bump to Raring.

[Pasi Lallinaho (knome)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-11 13:09:09 +0000
+++ debian/changelog	2013-03-19 19:46:18 +0000
@@ -1,3 +1,9 @@
+xubuntu-docs (13.04.0) raring; urgency=low
+
+  * Bumping to raring
+
+ -- Stephen Michael Kellat <[e-mail]>  Sat, 16 Mar 2013 16:09:37 -0400
+
 xubuntu-docs (12.10.2) quantal; urgency=low
 
   [ Book 'em Dano ]

=== modified file 'desktop-guide/C/managing-applications.xml'
--- desktop-guide/C/managing-applications.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/managing-applications.xml	2013-03-19 19:46:18 +0000
@@ -113,11 +113,10 @@
 		<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 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>
-
-			<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 dowload <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 <ulink url="&aptoffline-example;">usage example</ulink> to learn more about this powerful tool.
+
+			<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/libs/xubuntu.ent'
--- desktop-guide/libs/xubuntu.ent	2012-09-19 21:07:07 +0000
+++ desktop-guide/libs/xubuntu.ent	2013-03-19 19:46:18 +0000
@@ -2,8 +2,8 @@
 <!-- VERSION NUMBERS -->
 <!ENTITY last-lts-version '12.04' >
 <!ENTITY last-lts-codename 'Precise Pangolin' >
-<!ENTITY current-version '12.10' >
-<!ENTITY current-codename 'Quantal Quetzal' >
+<!ENTITY current-version '13.04' >
+<!ENTITY current-codename 'Raring Ringtail' >
 
 <!-- CORE -->
 <!ENTITY canonical-name 'Canonical Ltd.'>
@@ -16,6 +16,7 @@
 
 <!-- OTHER WEBSITES -->
 <!ENTITY aptoncd-web 'http://aptoncd.sourceforge.net/' >
+<!ENTITY aptoffline-example 'http://www.debian-administration.org/article/Offline_Package_Management_for_APT' >
 <!ENTITY askubuntu-web 'http://askubuntu.com/' >
 <!ENTITY canonical-web 'http://www.canonical.com/' >
 <!ENTITY cc-web 'http://creativecommons.org/' >