lp://staging/~paulbrianstewart/ubuntu/oneiric/ubuntu-docs/859165-Help-File-Correction

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/ubuntu/oneiric/ubuntu-docs

Michael Terry: Disapprove on 2011-09-26

Ubuntu branches: Pending requested 2011-09-25

Diff: 12 lines (+1/-1)

1 file modified

ubuntu-help/ubuntu-help.pot (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #859165: [oneiric] no close button in monitors (as written in help)

Undecided

Fix Released

Link a bug report

Related blueprints

102. By Paul Stewart on 2011-09-25

* Changed the wording of the text from "If this looks correct, click <gui>Close</gui>" to "If this looks correct close the window." This change is because there is no "Close" button on the window.

101. By Matthew East on 2011-09-18

[ Jeremy Bicha ]
* substantial merges from Gnome docs
* adjusted indicator order for this week's Unity (LP: #823061)
* Updated Seahorse's new name
* updated the Fallback page to reference Unity 2D instead of Fallback
* some updates for Oneiric's dash
* dropped files-preview-music since that was removed in GNOME 3.2
  (replaced by the sushi previewer which hasn't been packaged for
  Debian/Ubuntu yet)
* Added a proprietary driver page from the old ubuntu-docs

[ Jim Campbell ]
* added instructions on manually locking the screen.

100. By Matthew East on 2011-09-04

[ Christian Pommranz ]
* Fixed two typos in shell-windows-switching.page (LP: #795959)

[ Joel Pickett ]
* Fixed a typo in wireless troubleshooting guide (LP: #804855)

[ Jeremy Bicha ]
* Partially rebased with Gnome help now that we're using Gnome 3
* Build with yelp-tools instead of gnome-doc-utils
  - files now install to /usr/share/help/ instead of /usr/share/gnome/help/
* debian/compat: Switch to debhelper 8
* debian/control
  - Dropped obsolete conflicts & unneeded dependencies
  - Updated description
* debian/copyright: Updated, use DEP5 format
* debian/rules:
  - No need to specify install source directory
  - Use xz compression
* debian/source/format: Use 3.0 (native)
* Update user pages for new user menu
* Update indicator page with current indicators
* Added missing bluetooth & disk category pages
* Updated user-* pages
* Update moonlight page since it is no longer in Ubuntu archive

[ Matthew East ]
* Fix document validity issues
* Update pot file

99. By Matthew East on 2011-04-29

* Use Gnome and gnome-doc-utils for packaging - update debian/control
  for new build-deps accordingly
* Add Unity+Unity documentation here rather than gnome-user-docs; give it
  its own document id and install in ubuntu-help directory
* Remove browser homepage update-alternative system
* Update translations from gnome-user-docs natty package

98. By Matthew East on 2011-05-01

* SRU update bug: LP: #774734
* Add-applications:
  - Software Sources is now accessed through Software Center
    Giuseppe Terrasi
* Browser-startpage:
  - changed 10.10 to 11.04, updated weblinks to avoid extra redirects
    LP: #750506. Jeremy Bicha
* Games:
  - Remove comment about wine not supporting 64 bit. LP: #744984
    Connor Imes
* Internet:
  - Replace sun-java6-plugin with icedtea6-plugin. LP: #701235
    Connor Imes
  - Changed text for apt install links in web-apps.xml. LP: #721983
    Connor Imes
  - Added directions on checking user privileges for connecting to
    wireless networks. LP: #454994. Connor Imes
* Musicvideophotos:
  - Remove Realplayer section - Giuseppe Terrasi
* Serverguide:
  - Fixed type in subversion htpasswd command. LP: #768612
    Connor Imes
  - Removed alternate verification step of Moin Moin installation in
    serverguide that is no longer applicable. Fixes LP: #745553
    Connor Imes
* General - updates to html build system, not used in binary package
  Connor Imes, Matthew East

97. By Matthew East on 2011-04-22

* Updates for natty from Giuseppe Terrasi
  - Use Libreoffice instead of Openoffice.org
  - Use Banshee instead of Rhythmbox

96. By Matthew East on 2011-04-12

Convert ubuntu-docs package for use as help for "Ubuntu Classic" desktop
(Unity documentation provided by the gnome-user-guide package)

95. By Mahyuddin Susanto on 2010-12-06

* ldif at openldap installation is broken (LP: #677998)
  + serverguide/C/network-auth.xml

94. By Matthew East on 2010-09-19

* Amend font-family for browser startpage (LP: #195590)
* Add translations from Launchpad

93. By Matthew East on 2010-08-29

* Documentation String Freeze release
* General
  - No longer generate ubuntu-serverguide binary
  - Stop shipping serverguide, advanced-topics,
    basic-commands and windows in ubuntu-docs
  - Changes discussed on ubuntu-doc@ and ubuntu-server@
* Update version number for offline browser startpage
  LP: #632377
* Newtoubuntu:
  - Replace f-spot with shotwell
  - Fix some broken icons