Merge lp://qastaging/~jjfrv8/xubuntu-docs/final-saucy-revs into lp://qastaging/xubuntu-docs/saucy
Proposed by
Jack Fromm
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 76 | ||||
| Proposed branch: | lp://qastaging/~jjfrv8/xubuntu-docs/final-saucy-revs | ||||
| Merge into: | lp://qastaging/xubuntu-docs/saucy | ||||
| Diff against target: |
213 lines (+52/-16) (has conflicts) 6 files modified
debian/changelog (+4/-0) desktop-guide/C/guide-keeping-safe.xml (+3/-3) desktop-guide/C/hardware-devices.xml (+31/-11) desktop-guide/C/index.xml (+4/-0) desktop-guide/C/managing-applications.xml (+1/-1) desktop-guide/C/media-apps.xml (+9/-1) Text conflict in desktop-guide/C/hardware-devices.xml Text conflict in desktop-guide/C/index.xml |
||||
| To merge this branch: | bzr merge lp://qastaging/~jjfrv8/xubuntu-docs/final-saucy-revs | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Pasi Lallinaho (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
* In media-apps.xml, added caveat about having to install restricted software to play MP3s in gmusicbrowser.
* Several changes in internet-
* Removed obsolete application recommendations (Computer Janitor & Gnome Desktop Utilities) from hardware-
* Added steps to use a hibernation workaround to hardware-
To post a comment you must log in.
Revision history for this message
| Pasi Lallinaho (knome) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
