Merge lp:~dsmythies/serverguide/lp1129649_plus into lp:~ubuntu-core-doc/serverguide/raring
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Doug Smythies | ||||||||||||
Approved revision: | 120 | ||||||||||||
Merged at revision: | 120 | ||||||||||||
Proposed branch: | lp:~dsmythies/serverguide/lp1129649_plus | ||||||||||||
Merge into: | lp:~ubuntu-core-doc/serverguide/raring | ||||||||||||
Diff against target: |
325 lines (+57/-55) 7 files modified
serverguide/C/dm-multipath.xml (+10/-10) serverguide/C/installation.xml (+9/-2) serverguide/C/lamp-applications.xml (+1/-1) serverguide/C/network-auth.xml (+13/-14) serverguide/C/network-config.xml (+1/-1) serverguide/C/security.xml (+1/-1) serverguide/C/virtualization.xml (+22/-26) |
||||||||||||
To merge this branch: | bzr merge lp:~dsmythies/serverguide/lp1129649_plus | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Doug Smythies | Approve | ||
Review via email: mp+156227@code.launchpad.net |
Description of the change
This MP addresses:
LP: #1129649
LP: #1103870 (although not to the extent that was desired by the poster)
I thought maybe LP: #922251 , but some inforomation was just added to the bug report, so no.
Some odd strange garbage bytes in the .xml files were removed.
All non single byte UTF-8 characters in the .xml files were removed, and now this:
grep --color='auto' -P -n "[\x80-\xFF]" *.xml
doesn't find anything. Now the only multi byte UTF-8 characters in the master source files are two in ubuntu.xsl defining the double >> character used in the link trails, and such is consitent with other Ubuntu docs.
Some other minor edits.
I am looking for peer review for this merge proposal, but will not wait long for it, as time is running out.
I forgot:
Also a slight change related to LP: #1050595
And several of the multibyte UTF-8 characters in dm-multipath.xml were for quotes characters that were not needed anyhow as both the PDF and the HTML differentiate the text anyhow, so I took them out.
Note: the colored diff used herein might make some line changes difficult to see. The non-colored "bzr diff" display gets really confused by multi-byte UTF-8 characters.