Merge lp://staging/~timo-jyrinki/ubuntu/trusty/xubuntu-docs/14.04.0 into lp://staging/ubuntu/trusty/xubuntu-docs
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Merged at revision: | 35 |
| Proposed branch: | lp://staging/~timo-jyrinki/ubuntu/trusty/xubuntu-docs/14.04.0 |
| Merge into: | lp://staging/ubuntu/trusty/xubuntu-docs |
| Diff against target: |
36506 lines (+17212/-4247) 30 files modified
debian/changelog (+21/-0) debian/compat (+1/-1) debian/control (+2/-3) debian/rules (+2/-2) desktop-guide/C/command-line.xml (+1/-1) desktop-guide/C/guide-desktop.xml (+0/-121) desktop-guide/C/guide-keeping-safe.xml (+1/-1) desktop-guide/C/index.xml (+14/-10) desktop-guide/C/internet-networks.xml (+9/-9) desktop-guide/C/migrating-upgrading.xml (+1/-1) desktop-guide/C/offline-packages.xml (+1/-1) desktop-guide/C/printing-scanning.xml (+1/-1) desktop-guide/C/settings-preferences.xml (+147/-0) desktop-guide/Makefile (+5/-8) desktop-guide/libs/shipped-docs (+1/-1) desktop-guide/libs/xubuntu-banner.xsl (+1/-1) desktop-guide/libs/xubuntu-book.css (+26/-10) desktop-guide/libs/xubuntu-html-chunk-cust.xsl (+6/-4) desktop-guide/libs/xubuntu.ent (+12/-8) desktop-guide/po/desktop-guide.pot (+384/-356) desktop-guide/po/en_AU.po (+517/-465) desktop-guide/po/es.po (+1317/-669) desktop-guide/po/fi.po (+2450/-731) desktop-guide/po/fr.po (+494/-437) desktop-guide/po/oc.po (+4565/-0) desktop-guide/po/pl.po (+4530/-0) desktop-guide/po/pt.po (+2083/-754) desktop-guide/po/ru.po (+619/-649) scripts/get-pot.sh (+0/-2) startpage/xubuntu-index.html (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~timo-jyrinki/ubuntu/trusty/xubuntu-docs/14.04.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Timo Jyrinki | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Commit message
[ Pasi Lallinaho ]
* Update version numbers (14.04/Trusty) and copyright
* Fix text wrapping for information boxes
[ David Pires ]
* Add <application> tags for NetworkManager (LP: #1238718)
* Use 'sudo -i' instead of 'gksudo' (LP: #1251332)
* Fix typos (LP: #1243946)
* Add documentation for Mugshot
* Update documentation for xfdesktop
[ Unit 193 ]
* Fix typos
* Fix file permissions
* Build-dep drop use of cdbs use dh9, update d/compat
* Update standards version
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I asked on IRC that yes, Xubuntu people would like this to get sponsored. The diff looks good and I tested this with my own PPA build https:/
This is bzr134 of lp:xubuntu-docs added with https:/