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

[Stephen Michael Kellat]

Removed offline-packages from prominence in TOC, added LibreOffice downloads tip, added sync command tip, amplified caution about two package managers at once, removed reference to APTonCD as LP Bug 1221254 is going to break it

[Jack Fromm (jjfrv8)]

I'm okay with all the changes. I'm working on hardware-devices too and have lots of changes to make in it but I'll just add Stephen's addition to mine.

review: Approve

[Pasi Lallinaho (knome)]

Approved, with the small text change "Do not directly install the downloads" to "We do not suggest directly installing the downloads" (will do the change on commit myself).

review: Approve (committer)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-15 21:36:35 +0000
+++ debian/changelog	2013-09-17 23:40:14 +0000
@@ -19,13 +19,18 @@
   * Fixed a typo on the offline applications page
   * Added mention of ideviceinstaller to media-apps as another specialized tool for handling iPods
   * Added reference in guide-desktop to gtk-theme-config. (LP: #1219593)
+  * Removed in-depth notation for offline packages on table of contents as I never wrote what would have followed...the guide on how to sign the Ubuntu Code of Conduct
+  * Added to tip about LibreOffice in default-apps.xml a reminder from the Ubuntu Wiki on LibreOffice to not use The Document Foundation .deb files as they lack Ubuntu-specific patches
+  * In hardware-devices.xml added tip about the "sync" command line coreutil function to flush buffers in writing to disk which is handy with removable devices
+  * Amplified the caution in managing-applications.xml about having two package managers open at once
+  * Removed reference to APTonCD from managing-applications.xml since LP Bug 1175458 shows it is, as of 13.04, depending upon HAL of all things yet in LP Bug 1221254 Martin Pitt is coordinating the drive to purge any vestiges of HAL that remain in Ubuntu
 
   [ Jack Fromm ]
   * Grammar fixes and wording changes
   * Update the software-properties entity
   * Update GUI labels to match current versions
 
- -- Pasi Lallinaho <[e-mail]>  Mon, 16 Sep 2013 00:36:14 +0300
+ -- Pasi Lallinaho <[e-mail]>  Tue, 17 Sep 2013 19:32:05 -0400
 
 xubuntu-docs (13.04.0) raring; urgency=low
 

=== modified file 'desktop-guide/C/guide-default-apps.xml'
--- desktop-guide/C/guide-default-apps.xml	2013-09-07 00:51:35 +0000
+++ desktop-guide/C/guide-default-apps.xml	2013-09-17 23:40:14 +0000
@@ -56,7 +56,7 @@
 
 		<para><application>Gnumeric</application> is a spreadsheet editor and the perfect light companion for <application>AbiWord</application>.</para>
 
-		<tip><para>If you prefer the LibreOffice suite over these default applications, you can install it from the repositories as well as remove <application>AbiWord</application> and <application>Gnumeric</application> if desired.</para></tip>
+		<tip><para>If you prefer the LibreOffice suite over these default applications, you can install it from the repositories as well as remove <application>AbiWord</application> and <application>Gnumeric</application> if desired.  Do not directly install the downloads offered by The Document Foundation as they lack Ubuntu-specific patches and polish available from repositories.</para></tip>
 
 		<para><application>Dictionary</application> provides an easy way to access a number of different dictionaries across the internet. Read more at the <ulink url="&xfce4-dict-web;">Xfce4 Dictionary website</ulink>.</para>
 

=== modified file 'desktop-guide/C/hardware-devices.xml'
--- desktop-guide/C/hardware-devices.xml	2013-05-18 01:24:58 +0000
+++ desktop-guide/C/hardware-devices.xml	2013-09-17 23:40:14 +0000
@@ -149,7 +149,7 @@
 
 			<para>To find out how to mount and unmount storage devices manually and/or automatically, see the Ubuntu community wiki page for the <ulink url="&communitywiki-mount;">mount command</ulink>.</para>
 
-			<para>When you copy files to a removable storage device, they are not always written to the device immediately. Instead, they are often stored in a queue so that they can all be transferred across to the device at the same time (for reasons of efficiency). If you disconnect the device before all of the files have been transferred, you could lose the files. To prevent this, you must always unmount a removable device before disconnecting it.</para>
+			<para>When you copy files to a removable storage device, they are not always written to the device immediately. Instead, they are often stored in a queue so that they can all be transferred across to the device at the same time (for reasons of efficiency). Running the command <userinput>sync</userinput> can force pending data to be written to removable storage devices.  If you disconnect the device before all of the files have been transferred, you could lose the files. To prevent this, you must always unmount a removable device before disconnecting it.</para>
 		</section>
 	</section>
 

=== modified file 'desktop-guide/C/index.xml'
--- desktop-guide/C/index.xml	2013-09-02 20:56:59 +0000
+++ desktop-guide/C/index.xml	2013-09-17 23:40:14 +0000
@@ -71,10 +71,6 @@
 			<para><xref linkend="guide-default-apps"/></para>
 			<para><xref linkend="guide-keeping-safe"/></para>
 
-			<para>This guide also has one in-depth section:</para>
-
-			<para><xref linkend="offline-packages"/></para>
-
 			<para>The complete set of topics are listed below. If you require help with a topic or problem that is not addressed by the documentation, go to the the <ulink url="&xubuntu-web-help;">Help &amp; Support</ulink> page of the Xubuntu website. There you will find links to additional help resources.</para>
 
 			<para>If you would like to contribute to Xubuntu, including this documentation, see the <ulink url="&xubuntu-web-contribute;">Get Involved</ulink> section of the Xubuntu website.</para>

=== modified file 'desktop-guide/C/managing-applications.xml'
--- desktop-guide/C/managing-applications.xml	2013-05-25 17:15:33 +0000
+++ desktop-guide/C/managing-applications.xml	2013-09-17 23:40:14 +0000
@@ -22,7 +22,7 @@
 
 	<note><para>You will need administrative access to add and remove software.</para></note>
 
-	<caution><para>You can only use one package manager at a time. If you start another package manager while one is already open, you will receive an error message.</para></caution>
+	<caution><para>You can only use one package manager at a time. If you start another package manager while one is already open, you will receive an error message and the second package manager will not necessarily be able to function.</para></caution>
 
 	<section id="ubuntu-software-center">
 		<title>Using Ubuntu Software Center</title>
@@ -111,11 +111,10 @@
 		</section>
 
 		<section id="applications-offline-installation">
-			<title>Helpful applications</title>
+			<title>Helpful application</title>
 
 			<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 can be found in <xref linkend="offline-packages"/>.</para>
 
-			<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 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>
 		</section>
 	</section>