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

Proposed by Stephen Michael Kellat on 2013-03-16
Status: Superseded
Proposed branch: lp:~skellat/xubuntu-docs/xubuntu-docs
Merge into: lp:xubuntu-docs/quantal
Diff against target: 56 lines (+13/-7)
3 files modified
debian/changelog (+6/-0)
desktop-guide/C/managing-applications.xml (+4/-5)
desktop-guide/libs/xubuntu.ent (+3/-2)
To merge this branch: bzr merge lp:~skellat/xubuntu-docs/xubuntu-docs
Reviewer Review Type Date Requested Status
Pasi Lallinaho (community) 2013-03-16 Approve on 2013-03-18
Jeremy Bicha 2013-03-17 Pending
Elizabeth K. Joseph 2013-03-16 Pending
Review via email: mp+153668@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-19.

Description of the change

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

To post a comment you must log in.
Pasi Lallinaho (knome) wrote :

Looks good to me.

review: Approve
17. By Pasi Lallinaho on 2013-03-19

Merging Stephen's bump to Raring.

18. By Pasi Lallinaho on 2013-03-19

Merging Unit193's language clean-up. Strings should be en-US now.

19. By Pasi Lallinaho on 2013-03-19

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

20. By Pasi Lallinaho on 2013-03-19

Fix rendering issue in Chrome (LP: #1147192)

21. By Pasi Lallinaho on 2013-03-19

Update changelog

22. By Pasi Lallinaho on 2013-03-19

Specify min-width for masthead and footer as well.

23. By Pasi Lallinaho on 2013-03-20

Update the changelog

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-11 13:09:09 +0000
3+++ debian/changelog 2013-03-16 20:15:25 +0000
4@@ -1,3 +1,9 @@
5+xubuntu-docs (13.04.0) raring; urgency=low
6+
7+ * Bumping to raring
8+
9+ -- Stephen Michael Kellat <skellat@ubuntu.com> Sat, 16 Mar 2013 16:09:37 -0400
10+
11 xubuntu-docs (12.10.2) quantal; urgency=low
12
13 [ Book 'em Dano ]
14
15=== modified file 'desktop-guide/C/managing-applications.xml'
16--- desktop-guide/C/managing-applications.xml 2012-09-19 19:36:13 +0000
17+++ desktop-guide/C/managing-applications.xml 2013-03-16 20:15:25 +0000
18@@ -113,11 +113,10 @@
19 <section id="applications-offline-installation">
20 <title>Helpful applications</title>
21
22- <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>
23-
24- <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>
25-
26- <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>
27+ <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.
28+
29+ <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>
30+
31 </section>
32 </section>
33
34
35=== modified file 'desktop-guide/libs/xubuntu.ent'
36--- desktop-guide/libs/xubuntu.ent 2012-09-19 21:07:07 +0000
37+++ desktop-guide/libs/xubuntu.ent 2013-03-16 20:15:25 +0000
38@@ -2,8 +2,8 @@
39 <!-- VERSION NUMBERS -->
40 <!ENTITY last-lts-version '12.04' >
41 <!ENTITY last-lts-codename 'Precise Pangolin' >
42-<!ENTITY current-version '12.10' >
43-<!ENTITY current-codename 'Quantal Quetzal' >
44+<!ENTITY current-version '13.04' >
45+<!ENTITY current-codename 'Raring Ringtail' >
46
47 <!-- CORE -->
48 <!ENTITY canonical-name 'Canonical Ltd.'>
49@@ -16,6 +16,7 @@
50
51 <!-- OTHER WEBSITES -->
52 <!ENTITY aptoncd-web 'http://aptoncd.sourceforge.net/' >
53+<!ENTITY aptoffline-example 'http://www.debian-administration.org/article/Offline_Package_Management_for_APT' >
54 <!ENTITY askubuntu-web 'http://askubuntu.com/' >
55 <!ENTITY canonical-web 'http://www.canonical.com/' >
56 <!ENTITY cc-web 'http://creativecommons.org/' >

Subscribers

People subscribed via source and target branches