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
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2011-01-21 19:14:54 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+native = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2011-01-21 05:17:22 +0000
11+++ debian/changelog 2011-01-21 19:14:54 +0000
12@@ -1,4 +1,4 @@
13-xubuntu-docs (9.10.1ubuntu1) lucid; urgency=low
14+xubuntu-docs (9.10.1.10.04.1) lucid-proposed; urgency=low
15
16 [Book 'em Dano]
17 * desktop-guide/about-xubuntu/C/about-xubuntu.xml:
18@@ -22,23 +22,23 @@
19 section pertaining to Menu Editor as it has been removed from Xfce 4.6
20 - added appropriate tags, inputted correct entity
21 - revised instructions to add and select new theme
22- * desktop-guide/games/C/games.xml: added reference to Ubuntu Software Center &
23+ * desktop-guide/games/C/games.xml: added reference to Ubuntu Software Center &
24 other revisions (LP: #647187)
25 * desktop-guide/hardware/C/hardware.xml:
26 - added reference to Ubuntu Software Center & other revisions (LP: #647187)
27 - capitalized section titles, updated url for laptop testing & revised
28- instructions on how to activate/deactivate restricted/third-party drivers,
29+ instructions on how to activate/deactivate restricted/third-party drivers,
30 choose a blank screen as screensaver, commented out pm-general-method
31 section as it is obsolete (LP: #461158)
32 * desktop-guide/index.xml:
33- - commented out reference of files-and-docs.xml to remove from "Files, Folders
34- and Documents" chapter as it contains nothing other than links to other
35- sections (LP: #700347)
36+ - commented out reference of files-and-docs.xml to remove from "Files,
37+ Folders and Documents" chapter as it contains nothing other than links to
38+ other sections (LP: #700347)
39 - Commented out this reference as Advanced Topics chapter does not have any
40 unique substantive material, (LP: #700351)
41 * desktop-guide/internet/C/connecting.xml:
42- - added appropriate tags, corrected grammatical errors, added appropriate tags,
43- provided full names for acronyms
44+ - added appropriate tags, corrected grammatical errors, added appropriate
45+ tags, provided full names for acronyms
46 - revised instructions on how to connect to Mobile Broadband, VPN and DSL
47 connections
48 * desktop-guide/internet/C/connecttoserver.xml: changed directions to reflect
49@@ -46,7 +46,7 @@
50 & capitalized section titles
51 * desktop-guide/internet/C/disconnecting.xml: added appropriate tags
52 * desktop-guide/internet/C/information.xml: added appropriate tags
53- * desktop-guide/internet/C/networking.xml: capitalized section titles, changed
54+ * desktop-guide/internet/C/networking.xml: capitalized section titles, changed
55 tags, provided instructions on how to share folders with Shared Folders
56 application
57 * desktop-guide/internet/C/nm.xml: added appropriate tags, corrected
58@@ -59,12 +59,12 @@
59 * desktop-guide/internet/C/web-apps.xml:
60 - corrected licensing url
61 - corrected instructions to install plugins (LP: #645510), changed
62- reference of Add/Remove Applications to Ubuntu Software Center, capitalized
63- section titles, provide instructions on how to use XChat-IRC & downloading
64- torrents
65+ reference of Add/Remove Applications to Ubuntu Software Center,
66+ capitalized section titles, provide instructions on how to use XChat-IRC &
67+ downloading torrents
68 - changed tags, restructured appearance of file
69- * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on how to
70- add new user, capitalized section titles, provided instructions on how to
71+ * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on how
72+ to add new user, capitalized section titles, provided instructions on how to
73 install and utilize luckyBackup, (LP: #696328)
74 * desktop-guide/libs/global.ent:
75 - updated to lucid values
76@@ -76,7 +76,7 @@
77 - added entities, corrected name of Exaile
78 - corrected entities
79 - corrected Brasero entity (LP: #643022)
80- - removed xfce4-settings-manager entity as preferences entity with same path
81+ - removed xfce4-settings-manager entity as preferences entity with same path
82 existed; corrected path for Dictionary application
83 - removed duplicate entity
84 - added pictures & simple-scan entities, changed path of home-folder &
85@@ -104,7 +104,7 @@
86 Exaile
87 - capitalized section title, corrected internal link
88 * desktop-guide/musicvideophotos/C/video.xml:
89- - added correct package name; expounded on video-editing tools (LP: #644162,
90+ - added correct package name; expounded on video-editing tools (LP: #644162,
91 LP: #644100)
92 - revised instructions on how to install RealPlayer (LP: #643239), added
93 trademark tags & other revisions
94@@ -117,20 +117,20 @@
95 * desktop-guide/newtoubuntu/C/xfce-desktop.xml:
96 - various revisions & removed references to obsolete plugins (LP: #641805,
97 LP: #641793)
98- - changed tags, corrected grammatical errors, revised instructions to change
99+ - changed tags, corrected grammatical errors, revised instructions to change
100 background image & on how to restore deleted items, corrected url for
101 LinuxLogFiles
102 - added appropriate tags, revised instructions on how to change background
103 image
104 - capitalized section titles, added appropriate tags & changed user
105 interaction verbs
106- * desktop-guide/office/C/office.xml: changed user interaction verbs, added apt
107+ * desktop-guide/office/C/office.xml: changed user interaction verbs, added apt
108 links, changed tags & capitalized section titles
109 * desktop-guide/printing/C/printing.xml: capitalized section titles, added
110 appropriate tags, revised instruction on setting up printer and scanning,
111- provided instruction to install hp-lip, in order to check printer ink levels
112+ provided instruction to install hp-lip, in order to check printer ink levels
113 (LP: #656700)
114- * desktop-guide/programming/C/programming.xml: capitalized titles of sections,
115+ * desktop-guide/programming/C/programming.xml: capitalized titles of sections,
116 fixed grammatical errors, commented out reference & installation of
117 sun-java5-jdk as it is obsolete, updated url to Subversion, changed Gambas
118 to Gambas2
119@@ -150,7 +150,7 @@
120 * startpage/xubuntu-index.html: update to lucid
121 * applied for Stable Release Update (LP: #705734)
122
123- -- Book 'em Dano <heymrdjd@gmail.com> Tue, 21 Dec 2010 00:17:11 -0600
124+ -- Book 'em Dano <heymrdjd@gmail.com> Fri, 21 Jan 2011 11:53:23 -0600
125
126 xubuntu-docs (9.10.1) karmic; urgency=low
127

Subscribers

People subscribed via source and target branches