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, corrected grammatical errors, added
> appropriate
> +      tags, provided full names for acronyms
>     - revised instructions on how to connect to Mobile Broadband, VPN and
> DSL
>       connections
>   * desktop-guide/internet/C/connecttoserver.xml: changed directions to
> reflect
> @@ -46,7 +46,7 @@
>     & capitalized section titles
>   * desktop-guide/internet/C/disconnecting.xml: added appropriate tags
>   * desktop-guide/internet/C/information.xml: added appropriate tags
> -  * desktop-guide/internet/C/networking.xml: capitalized section titles,
> changed
> +  * desktop-guide/internet/C/networking.xml: capitalized section titles,
> changed
>     tags, provided instructions on how to share folders with Shared Folders
>     application
>   * desktop-guide/internet/C/nm.xml: added appropriate tags, corrected
> @@ -59,12 +59,12 @@
>   * desktop-guide/internet/C/web-apps.xml:
>     - corrected licensing url
>     - corrected instructions to install plugins (LP: #645510), changed
> -      reference of Add/Remove Applications to Ubuntu Software Center,
> capitalized
> -      section titles, provide instructions on how to use XChat-IRC &
> downloading
> -      torrents
> +      reference of Add/Remove Applications to Ubuntu Software Center,
> +      capitalized section titles, provide instructions on how to use
> XChat-IRC &
> +      downloading torrents
>     - changed tags, restructured appearance of file
> -  * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on
> how to
> -    add new user, capitalized section titles, provided instructions on how
> to
> +  * desktop-guide/keeping-safe/C/keeping-safe.xml: revised instructions on
> how
> +    to add new user, capitalized section titles, provided instructions on
> how to
>     install and utilize luckyBackup, (LP: #696328)
>   * desktop-guide/libs/global.ent:
>     - updated to lucid values
> @@ -76,7 +76,7 @@
>     - added entities, corrected name of Exaile
>     - corrected entities
>     - corrected Brasero entity (LP: #643022)
> -    - removed xfce4-settings-manager entity as preferences entity with
> same path
> +    - removed xfce4-settings-manager entity as preferences entity with
> same path
>       existed; corrected path for Dictionary application
>     - removed duplicate entity
>     - added pictures & simple-scan entities, changed path of home-folder &
> @@ -104,7 +104,7 @@
>       Exaile
>     - capitalized section title, corrected internal link
>   * desktop-guide/musicvideophotos/C/video.xml:
> -    - added correct package name; expounded on video-editing tools (LP:
> #644162,
> +    - added correct package name; expounded on video-editing tools (LP:
> #644162,
>       LP: #644100)
>     - revised instructions on how to install RealPlayer (LP: #643239),
> added
>       trademark tags & other revisions
> @@ -117,20 +117,20 @@
>   * desktop-guide/newtoubuntu/C/xfce-desktop.xml:
>     - various revisions & removed references to obsolete plugins (LP:
> #641805,
>       LP: #641793)
> -    - changed tags, corrected grammatical errors, revised instructions to
> change
> +    - changed tags, corrected grammatical errors, revised instructions to
> change
>       background image & on how to restore deleted items, corrected url for
>       LinuxLogFiles
>     - added appropriate tags, revised instructions on how to change
> background
>       image
>     - capitalized section titles, added appropriate tags & changed user
>       interaction verbs
> -  * desktop-guide/office/C/office.xml: changed user interaction verbs,
> added apt
> +  * desktop-guide/office/C/office.xml: changed user interaction verbs,
> added apt
>     links, changed tags & capitalized section titles
>   * desktop-guide/printing/C/printing.xml: capitalized section titles,
> added
>     appropriate tags, revised instruction on setting up printer and
> scanning,
> -    provided instruction to install hp-lip, in order to check printer ink
> levels
> +    provided instruction to install hp-lip, in order to check printer ink
> levels
>     (LP: #656700)
> -  * desktop-guide/programming/C/programming.xml: capitalized titles of
> sections,
> +  * desktop-guide/programming/C/programming.xml: capitalized titles of
> sections,
>     fixed grammatical errors, commented out reference & installation of
>     sun-java5-jdk as it is obsolete, updated url to Subversion, changed
> Gambas
>     to Gambas2
> @@ -150,7 +150,7 @@
>   * startpage/xubuntu-index.html: update to lucid
>   * applied for Stable Release Update (LP: #705734)
>
> - -- Book 'em Dano <email address hidden>  Tue, 21 Dec 2010 00:17:11 -0600
> + -- Book 'em Dano <email address hidden>  Fri, 21 Jan 2011 11:53:23 -0600
>
>  xubuntu-docs (9.10.1) karmic; urgency=low
>
>
>
>