Xubuntu Documentation

Merge lp:~micahg/xubuntu-docs/9.10.1.10.04.1 into lp:xubuntu-docs/lucid

  1. 9.10.1.10.04.1
  2. Merge into lucid
Proposed by Micah Gersten
Status: Merged
Approved by: Book 'em Dano
Approved revision: 280
Merged at revision: 278
Proposed branch: lp:~micahg/xubuntu-docs/9.10.1.10.04.1
Merge into: lp:xubuntu-docs/lucid
Diff against target: 126 lines (+23/-21)
2 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+21/-21)
To merge this branch: bzr merge lp:~micahg/xubuntu-docs/9.10.1.10.04.1
Reviewer Review Type Date Requested Status
Book 'em Dano (community) Approve
Review via email: mp+47079@code.launchpad.net

Description of the change

Wrap changelog at 80 chars
Target to lucid-proposed
Fix version to 9.10.1.10.04.1

To post a comment you must log in.
Revision history for this message
Book 'em Dano (heymrdjd) wrote :
Download full text (7.8 KiB)

Thanks for your assistance, Micah.

 review approve

On Fri, Jan 21, 2011 at 1:15 PM, Micah Gersten <
<email address hidden>> wrote:

> Micah Gersten has proposed merging lp:~micahg/xubuntu-docs/9.10.1.10.04.1
> into lp:xubuntu-docs/lucid.
>
> Requested reviews:
> Ubuntu Documentation Committers (ubuntu-core-doc)
>
> For more details, see:
> https://code.launchpad.net/~micahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079<https://code.launchpad.net/%7Emicahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079>
>
> Wrap changelog at 80 chars
> Target to lucid-proposed
> Fix version to 9.10.1.10.04.1
> --
> https://code.launchpad.net/~micahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079<https://code.launchpad.net/%7Emicahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079>
> Your team Ubuntu Documentation Committers is requested to review the
> proposed merge of lp:~micahg/xubuntu-docs/9.10.1.10.04.1 into
> lp:xubuntu-docs/lucid.
>
> === added directory '.bzr-builddeb'
> === added file '.bzr-builddeb/default.conf'
> --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
> +++ .bzr-builddeb/default.conf 2011-01-21 19:14:54 +0000
> @@ -0,0 +1,2 @@
> +[BUILDDEB]
> +native = True
>
> === modified file 'debian/changelog'
> --- debian/changelog 2011-01-21 05:17:22 +0000
> +++ debian/changelog 2011-01-21 19:14:54 +0000
> @@ -1,4 +1,4 @@
> -xubuntu-docs (9.10.1ubuntu1) lucid; urgency=low
> +xubuntu-docs (9.10.1.10.04.1) lucid-proposed; urgency=low
>
> [Book 'em Dano]
> * desktop-guide/about-xubuntu/C/about-xubuntu.xml:
> @@ -22,23 +22,23 @@
> section pertaining to Menu Editor as it has been removed from Xfce
> 4.6
> - added appropriate tags, inputted correct entity
> - revised instructions to add and select new theme
> - * desktop-guide/games/C/games.xml: added reference to Ubuntu Software
> Center &
> + * desktop-guide/games/C/games.xml: added reference to Ubuntu Software
> Center &
> other revisions (LP: #647187)
> * desktop-guide/hardware/C/hardware.xml:
> - added reference to Ubuntu Software Center & other revisions (LP:
> #647187)
> - capitalized section titles, updated url for laptop testing & revised
> - instructions on how to activate/deactivate restricted/third-party
> drivers,
> + instructions on how to activate/deactivate restricted/third-party
> drivers,
> choose a blank screen as screensaver, commented out pm-general-method
> section as it is obsolete (LP: #461158)
> * desktop-guide/index.xml:
> - - commented out reference of files-and-docs.xml to remove from "Files,
> Folders
> - and Documents" chapter as it contains nothing other than links to
> other
> - sections (LP: #700347)
> + - commented out reference of files-and-docs.xml to remove from "Files,
> + Folders and Documents" chapter as it contains nothing other than
> links to
> + other sections (LP: #700347)
> - Commented out this reference as Advanced Topics chapter does not have
> any
> unique substantive material, (LP: #700351)
> * desktop-guide/internet/C/connecting.xml:
> - - added appropriate tags, corrected grammatical errors, added
> appropriate tags,
> - provided full names for acronyms
...

Read more...

review: Approve
Revision history for this message
Book 'em Dano (heymrdjd) wrote :
Download full text (7.8 KiB)

 merge approved

On Fri, Jan 21, 2011 at 1:15 PM, Micah Gersten <
<email address hidden>> wrote:

> Micah Gersten has proposed merging lp:~micahg/xubuntu-docs/9.10.1.10.04.1
> into lp:xubuntu-docs/lucid.
>
> Requested reviews:
> Ubuntu Documentation Committers (ubuntu-core-doc)
>
> For more details, see:
> https://code.launchpad.net/~micahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079<https://code.launchpad.net/%7Emicahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079>
>
> Wrap changelog at 80 chars
> Target to lucid-proposed
> Fix version to 9.10.1.10.04.1
> --
> https://code.launchpad.net/~micahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079<https://code.launchpad.net/%7Emicahg/xubuntu-docs/9.10.1.10.04.1/+merge/47079>
> Your team Ubuntu Documentation Committers is requested to review the
> proposed merge of lp:~micahg/xubuntu-docs/9.10.1.10.04.1 into
> lp:xubuntu-docs/lucid.
>
> === added directory '.bzr-builddeb'
> === added file '.bzr-builddeb/default.conf'
> --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
> +++ .bzr-builddeb/default.conf 2011-01-21 19:14:54 +0000
> @@ -0,0 +1,2 @@
> +[BUILDDEB]
> +native = True
>
> === modified file 'debian/changelog'
> --- debian/changelog 2011-01-21 05:17:22 +0000
> +++ debian/changelog 2011-01-21 19:14:54 +0000
> @@ -1,4 +1,4 @@
> -xubuntu-docs (9.10.1ubuntu1) lucid; urgency=low
> +xubuntu-docs (9.10.1.10.04.1) lucid-proposed; urgency=low
>
> [Book 'em Dano]
> * desktop-guide/about-xubuntu/C/about-xubuntu.xml:
> @@ -22,23 +22,23 @@
> section pertaining to Menu Editor as it has been removed from Xfce
> 4.6
> - added appropriate tags, inputted correct entity
> - revised instructions to add and select new theme
> - * desktop-guide/games/C/games.xml: added reference to Ubuntu Software
> Center &
> + * desktop-guide/games/C/games.xml: added reference to Ubuntu Software
> Center &
> other revisions (LP: #647187)
> * desktop-guide/hardware/C/hardware.xml:
> - added reference to Ubuntu Software Center & other revisions (LP:
> #647187)
> - capitalized section titles, updated url for laptop testing & revised
> - instructions on how to activate/deactivate restricted/third-party
> drivers,
> + instructions on how to activate/deactivate restricted/third-party
> drivers,
> choose a blank screen as screensaver, commented out pm-general-method
> section as it is obsolete (LP: #461158)
> * desktop-guide/index.xml:
> - - commented out reference of files-and-docs.xml to remove from "Files,
> Folders
> - and Documents" chapter as it contains nothing other than links to
> other
> - sections (LP: #700347)
> + - commented out reference of files-and-docs.xml to remove from "Files,
> + Folders and Documents" chapter as it contains nothing other than
> links to
> + other sections (LP: #700347)
> - Commented out this reference as Advanced Topics chapter does not have
> any
> unique substantive material, (LP: #700351)
> * desktop-guide/internet/C/connecting.xml:
> - - added appropriate tags, corrected grammatical errors, added
> appropriate tags,
> - provided full names for acronyms
> + - added appropriate tags, cor...

Read more...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2011-01-21 19:14:54 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2native = True
03
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-21 05:17:22 +0000
+++ debian/changelog 2011-01-21 19:14:54 +0000
@@ -1,4 +1,4 @@
1xubuntu-docs (9.10.1ubuntu1) lucid; urgency=low1xubuntu-docs (9.10.1.10.04.1) lucid-proposed; urgency=low
22
3 [Book 'em Dano]3 [Book 'em Dano]
4 * desktop-guide/about-xubuntu/C/about-xubuntu.xml: 4 * desktop-guide/about-xubuntu/C/about-xubuntu.xml:
@@ -22,23 +22,23 @@
22 section pertaining to Menu Editor as it has been removed from Xfce 4.622 section pertaining to Menu Editor as it has been removed from Xfce 4.6
23 - added appropriate tags, inputted correct entity23 - added appropriate tags, inputted correct entity
24 - revised instructions to add and select new theme24 - revised instructions to add and select new theme
25 * desktop-guide/games/C/games.xml: added reference to Ubuntu Software Center & 25 * desktop-guide/games/C/games.xml: added reference to Ubuntu Software Center &
26 other revisions (LP: #647187)26 other revisions (LP: #647187)
27 * desktop-guide/hardware/C/hardware.xml: 27 * desktop-guide/hardware/C/hardware.xml:
28 - added reference to Ubuntu Software Center & other revisions (LP: #647187)28 - added reference to Ubuntu Software Center & other revisions (LP: #647187)
29 - capitalized section titles, updated url for laptop testing & revised 29 - capitalized section titles, updated url for laptop testing & revised
30 instructions on how to activate/deactivate restricted/third-party drivers, 30 instructions on how to activate/deactivate restricted/third-party drivers,
31 choose a blank screen as screensaver, commented out pm-general-method 31 choose a blank screen as screensaver, commented out pm-general-method
32 section as it is obsolete (LP: #461158)32 section as it is obsolete (LP: #461158)
33 * desktop-guide/index.xml: 33 * desktop-guide/index.xml:
34 - commented out reference of files-and-docs.xml to remove from "Files, Folders 34 - commented out reference of files-and-docs.xml to remove from "Files,
35 and Documents" chapter as it contains nothing other than links to other 35 Folders and Documents" chapter as it contains nothing other than links to
36 sections (LP: #700347)36 other sections (LP: #700347)
37 - Commented out this reference as Advanced Topics chapter does not have any 37 - Commented out this reference as Advanced Topics chapter does not have any
38 unique substantive material, (LP: #700351)38 unique substantive material, (LP: #700351)
39 * desktop-guide/internet/C/connecting.xml: 39 * desktop-guide/internet/C/connecting.xml:
40 - added appropriate tags, corrected grammatical errors, added appropriate tags, 40 - added appropriate tags, corrected grammatical errors, added appropriate
41 provided full names for acronyms41 tags, provided full names for acronyms
42 - revised instructions on how to connect to Mobile Broadband, VPN and DSL 42 - revised instructions on how to connect to Mobile Broadband, VPN and DSL
43 connections43 connections
44 * desktop-guide/internet/C/connecttoserver.xml: changed directions to reflect 44 * desktop-guide/internet/C/connecttoserver.xml: changed directions to reflect
@@ -46,7 +46,7 @@
46 & capitalized section titles46 & capitalized section titles
47 * desktop-guide/internet/C/disconnecting.xml: added appropriate tags47 * desktop-guide/internet/C/disconnecting.xml: added appropriate tags
48 * desktop-guide/internet/C/information.xml: added appropriate tags48 * desktop-guide/internet/C/information.xml: added appropriate tags
49 * desktop-guide/internet/C/networking.xml: capitalized section titles, changed 49 * desktop-guide/internet/C/networking.xml: capitalized section titles, changed
50 tags, provided instructions on how to share folders with Shared Folders 50 tags, provided instructions on how to share folders with Shared Folders
51 application51 application
52 * desktop-guide/internet/C/nm.xml: added appropriate tags, corrected 52 * desktop-guide/internet/C/nm.xml: added appropriate tags, corrected
@@ -59,12 +59,12 @@
59 * desktop-guide/internet/C/web-apps.xml: 59 * desktop-guide/internet/C/web-apps.xml:
60 - corrected licensing url60 - corrected licensing url
61 - corrected instructions to install plugins (LP: #645510), changed 61 - corrected instructions to install plugins (LP: #645510), changed
62 reference of Add/Remove Applications to Ubuntu Software Center, capitalized 62 reference of Add/Remove Applications to Ubuntu Software Center,
63 section titles, provide instructions on how to use XChat-IRC & downloading 63 capitalized section titles, provide instructions on how to use XChat-IRC &
64 torrents64 downloading torrents
65 - changed tags, restructured appearance of file65 - changed tags, restructured appearance of file
66 * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on how to 66 * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on how
67 add new user, capitalized section titles, provided instructions on how to 67 to add new user, capitalized section titles, provided instructions on how to
68 install and utilize luckyBackup, (LP: #696328)68 install and utilize luckyBackup, (LP: #696328)
69 * desktop-guide/libs/global.ent: 69 * desktop-guide/libs/global.ent:
70 - updated to lucid values70 - updated to lucid values
@@ -76,7 +76,7 @@
76 - added entities, corrected name of Exaile76 - added entities, corrected name of Exaile
77 - corrected entities77 - corrected entities
78 - corrected Brasero entity (LP: #643022)78 - corrected Brasero entity (LP: #643022)
79 - removed xfce4-settings-manager entity as preferences entity with same path 79 - removed xfce4-settings-manager entity as preferences entity with same path
80 existed; corrected path for Dictionary application80 existed; corrected path for Dictionary application
81 - removed duplicate entity81 - removed duplicate entity
82 - added pictures & simple-scan entities, changed path of home-folder & 82 - added pictures & simple-scan entities, changed path of home-folder &
@@ -104,7 +104,7 @@
104 Exaile104 Exaile
105 - capitalized section title, corrected internal link105 - capitalized section title, corrected internal link
106 * desktop-guide/musicvideophotos/C/video.xml: 106 * desktop-guide/musicvideophotos/C/video.xml:
107 - added correct package name; expounded on video-editing tools (LP: #644162, 107 - added correct package name; expounded on video-editing tools (LP: #644162,
108 LP: #644100)108 LP: #644100)
109 - revised instructions on how to install RealPlayer (LP: #643239), added 109 - revised instructions on how to install RealPlayer (LP: #643239), added
110 trademark tags & other revisions110 trademark tags & other revisions
@@ -117,20 +117,20 @@
117 * desktop-guide/newtoubuntu/C/xfce-desktop.xml: 117 * desktop-guide/newtoubuntu/C/xfce-desktop.xml:
118 - various revisions & removed references to obsolete plugins (LP: #641805, 118 - various revisions & removed references to obsolete plugins (LP: #641805,
119 LP: #641793)119 LP: #641793)
120 - changed tags, corrected grammatical errors, revised instructions to change 120 - changed tags, corrected grammatical errors, revised instructions to change
121 background image & on how to restore deleted items, corrected url for 121 background image & on how to restore deleted items, corrected url for
122 LinuxLogFiles122 LinuxLogFiles
123 - added appropriate tags, revised instructions on how to change background 123 - added appropriate tags, revised instructions on how to change background
124 image124 image
125 - capitalized section titles, added appropriate tags & changed user 125 - capitalized section titles, added appropriate tags & changed user
126 interaction verbs126 interaction verbs
127 * desktop-guide/office/C/office.xml: changed user interaction verbs, added apt 127 * desktop-guide/office/C/office.xml: changed user interaction verbs, added apt
128 links, changed tags & capitalized section titles128 links, changed tags & capitalized section titles
129 * desktop-guide/printing/C/printing.xml: capitalized section titles, added 129 * desktop-guide/printing/C/printing.xml: capitalized section titles, added
130 appropriate tags, revised instruction on setting up printer and scanning, 130 appropriate tags, revised instruction on setting up printer and scanning,
131 provided instruction to install hp-lip, in order to check printer ink levels 131 provided instruction to install hp-lip, in order to check printer ink levels
132 (LP: #656700)132 (LP: #656700)
133 * desktop-guide/programming/C/programming.xml: capitalized titles of sections, 133 * desktop-guide/programming/C/programming.xml: capitalized titles of sections,
134 fixed grammatical errors, commented out reference & installation of 134 fixed grammatical errors, commented out reference & installation of
135 sun-java5-jdk as it is obsolete, updated url to Subversion, changed Gambas 135 sun-java5-jdk as it is obsolete, updated url to Subversion, changed Gambas
136 to Gambas2136 to Gambas2
@@ -150,7 +150,7 @@
150 * startpage/xubuntu-index.html: update to lucid150 * startpage/xubuntu-index.html: update to lucid
151 * applied for Stable Release Update (LP: #705734)151 * applied for Stable Release Update (LP: #705734)
152152
153 -- Book 'em Dano <heymrdjd@gmail.com> Tue, 21 Dec 2010 00:17:11 -0600153 -- Book 'em Dano <heymrdjd@gmail.com> Fri, 21 Jan 2011 11:53:23 -0600
154154
155xubuntu-docs (9.10.1) karmic; urgency=low155xubuntu-docs (9.10.1) karmic; urgency=low
156156

Subscribers

People subscribed via source and target branches