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

[Stephen Michael Kellat]

1. Expanded the offline-packages.xml page to include a package installation example for tuxpaint.
2. Added name to credits page.

[Pasi Lallinaho (knome)]

review: Needs Resubmitting

[Pasi Lallinaho (knome)]

GUI should be preferred over CLI if the latter method isn't clearly superior in majority of the use cases.

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

23. By Pasi Lallinaho on 2013-03-20

Update the changelog

[Stephen Michael Kellat (skellat)]

Unless you have more than ten packages to install at once, the GUI is not really necessary. The CLI works work for general cases.

[Stephen Michael Kellat (skellat)]

In general, grabbing a single package grabs the dependencies too. The only time you'd really need the GUI is if you were being picky in installing LibreOffice in terms of which bits and pieces you needed.

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

24. By Pasi Lallinaho on 2013-03-24

Update CSS to fix some aligning issues.

25. By Pasi Lallinaho on 2013-03-24

Merging Stephen's modifications for the offline package management page. Thanks!

26. By Pasi Lallinaho on 2013-03-24

Bump startpage to Raring.

27. By Pasi Lallinaho on 2013-03-27

Merging Stephen's branch to fix inconsistencies.

28. By Pasi Lallinaho on 2013-05-07

Bumping startpage and entities to 13.10.

29. By Pasi Lallinaho on 2013-05-07

Update changelog.

30. By Pasi Lallinaho on 2013-05-17

Update the script that creates the .pot file; create one.

31. By Pasi Lallinaho on 2013-05-18

Rename to "Xubuntu Documentation" instead of "Xubuntu Offline Documentation"

32. By Pasi Lallinaho on 2013-05-18

Include the legal notice directly in index.xml

33. By Pasi Lallinaho on 2013-05-18

Merging Unit 193's branch for fixes.

34. By Pasi Lallinaho on 2013-05-18

Move some things around.

35. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-19

Launchpad automatic translations update.

36. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-20

Launchpad automatic translations update.

37. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-21

Launchpad automatic translations update.

38. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-22

Launchpad automatic translations update.

39. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-23

Launchpad automatic translations update.

40. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-24

Launchpad automatic translations update.

41. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-25

Launchpad automatic translations update.

42. By Pasi Lallinaho on 2013-05-25

Merging Stephen's changed on offline package management.

43. By Pasi Lallinaho on 2013-05-25

Merge Jack's grammar fixes, wording changes and entity update.
Update changelog.

44. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-28

Launchpad automatic translations update.

45. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-29

Launchpad automatic translations update.

46. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-05-30

Launchpad automatic translations update.

47. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-06-18

Launchpad automatic translations update.

48. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-06-19

Launchpad automatic translations update.

49. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-06-20

Launchpad automatic translations update.

50. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-06-24

Launchpad automatic translations update.

51. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-06-25

Launchpad automatic translations update.

52. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-06

Launchpad automatic translations update.

53. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-07

Launchpad automatic translations update.

54. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-08

Launchpad automatic translations update.

55. By Pasi Lallinaho on 2013-07-12

Merge Jack's changes and update the changelog.

56. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-17

Launchpad automatic translations update.

57. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-18

Launchpad automatic translations update.

58. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-26

Launchpad automatic translations update.

59. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-27

Launchpad automatic translations update.

60. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-28

Launchpad automatic translations update.

61. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-07-29

Launchpad automatic translations update.

62. By Pasi Lallinaho on 2013-07-30

Fix the startpage CSS

63. By Pasi Lallinaho on 2013-08-01

Remove a superfluous "Note" -text

64. By Pasi Lallinaho on 2013-08-01

Merge main.

65. By Pasi Lallinaho on 2013-09-02

Remove Twitter plugin mention from Pidgin information.

66. By Pasi Lallinaho on 2013-09-02

Merging with main.

67. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-03

Launchpad automatic translations update.

68. By Pasi Lallinaho on 2013-09-03

Fix inconsistencies between the Start page and the Documentation.
Fix alignment of the title element when window is stretched to a small horizontal size.

69. By Pasi Lallinaho on 2013-09-03

Merging Stephen's changes.

70. By Pasi Lallinaho on 2013-09-03

Fix broken markup.

71. By Pasi Lallinaho on 2013-09-08

Merging Jack's changes to chapters 4 and 7.

72. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-11

Launchpad automatic translations update.

73. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-12

Launchpad automatic translations update.

74. By Pasi Lallinaho on 2013-09-15

Merging Jack's changes.

75. By Stephen Michael Kellat on 2013-09-17

Removed offline-packages from 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

Unmerged revisions

75. By Stephen Michael Kellat on 2013-09-17

Removed offline-packages from 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

74. By Pasi Lallinaho on 2013-09-15

Merging Jack's changes.

73. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-12

Launchpad automatic translations update.

72. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-11

Launchpad automatic translations update.

71. By Pasi Lallinaho on 2013-09-08

Merging Jack's changes to chapters 4 and 7.

70. By Pasi Lallinaho on 2013-09-03

Fix broken markup.

69. By Pasi Lallinaho on 2013-09-03

Merging Stephen's changes.

68. By Pasi Lallinaho on 2013-09-03

Fix inconsistencies between the Start page and the Documentation.
Fix alignment of the title element when window is stretched to a small horizontal size.

67. By Launchpad Translations on behalf of ubuntu-core-doc on 2013-09-03

Launchpad automatic translations update.

66. By Pasi Lallinaho on 2013-09-02

Merging with main.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-20 00:51:40 +0000
+++ debian/changelog	2013-03-20 01:31:19 +0000
@@ -3,6 +3,7 @@
   [ Stephen Michael Kellat ]
   * Bumping to raring
   * Created initial page describing use of apt-offline and added additional clean-up
+  * Added example to the offline-packages page of installing tuxpaint and how dependencies are grabbed.  Also, as per Pasi's suggestion, located credits page and added name to listing.
 
   [ Unit193 ]
   * Language clean up (make text en-US)

=== modified file 'desktop-guide/C/offline-packages.xml'
--- desktop-guide/C/offline-packages.xml	2013-03-19 21:39:04 +0000
+++ desktop-guide/C/offline-packages.xml	2013-03-20 01:31:19 +0000
@@ -25,10 +25,22 @@
 		<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="offline-package-install">
+		<title>Installing a Package</title>
+
+		<para>After plugging in a USB flash drive and opening a terminal, you can use apt-offline to grab a package to install.  This action can also be combined with updating your computer's understanding of the contents of the software repositories.  In a disconnected environment, using what connection opportunities you have to the max is key</para>
+
+		<para>In this example, assume you want to install <application>tuxpaint</tuxpaint> and dependencies.  From your disconnected computer you enter this at the command line: <userinput>apt-offline set --install-packages tuxpaint --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>.  The command's output will show an attempt to download updates as to what the repositories look like as well as <application>tuxpaint</application> and the dependencies your system requires.  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.  Once that completes, you can then install <application>tuxpaint</application> by then entering: <userinput>sudo apt-get install tuxpaint</userinput>.</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>
+		<para>The graphical tool <application>apt-offline-gui</application> helps you walk through the process for more complicated installations and upgrading applications while following the same basic steps as shown above.  As a mirror to the command-line tool's three modes, you have three buttons to enter specific forms to structure how you wish disconnected application management to proceed much like the steps above.  A key disadvantage, though, to the GUI is that helpful error messages are sometimes not passed along compared to the command line version.</para>
 
 	</section>
 

=== modified file 'desktop-guide/libs/legal/C/legal-notice.xml'
--- desktop-guide/libs/legal/C/legal-notice.xml	2012-10-11 12:25:46 +0000
+++ desktop-guide/libs/legal/C/legal-notice.xml	2013-03-20 01:31:19 +0000
@@ -4,15 +4,16 @@
 		<para>This document is maintained by the <ulink url="https://wiki.ubuntu.com/DocumentationTeam">Ubuntu
 			documentation team</ulink>. This documentation is partly adapted from the Ubuntu documentation.</para>
 
-		<para>The contributors to this documentation are:</para>
-		<itemizedlist>
-			<listitem><para>Sean Davis (smd-seandavis)</para></listitem>
-			<listitem><para>Jack Fromm (jjfrv8-gmail)</para></listitem>
-			<listitem><para>Elizabeth Krumbach (lyz)</para></listitem>
-			<listitem><para>Pasi Lallinaho (knome)</para></listitem>
-			<listitem><para>Kev (elfy)</para></listitem>
-			<listitem><para>Jay van Cooten (skippersboss)</para></listitem>
-		</itemizedlist>
+		 <para>The contributors to this documentation are:</para>
+		 <itemizedlist>
+			 <listitem><para>Sean Davis (smd-seandavis)</para></listitem> 
+			 <listitem><para>Jack Fromm (jjfrv8-gmail)</para></listitem> 
+			 <listitem><para>Elizabeth Krumbach (lyz)</para></listitem> 
+			 <listitem><para>Pasi Lallinaho (knome)</para></listitem> 
+			 <listitem><para>Kev (elfy)</para></listitem> 
+			 <listitem><para>Jay van Cooten (skippersboss)</para></listitem> 
+			 <listitem><para>Stephen Michael Kellat (skellat)</para></listitem>
+		 </itemizedlist>
 
 		<para>The contributors to previous versions to this documentation are:</para>
 		<itemizedlist>