Ubuntu Manual

Merge lp://qastaging/~ubuntu-manual/ubuntu-manual/main into lp://qastaging/~jflaker/ubuntu-manual/FixBug1358406

main
Merge into FixBug1358406

Proposed by Jeffrey Flaker on 2014-09-01

Status:

Superseded

Proposed branch:

lp://qastaging/~ubuntu-manual/ubuntu-manual/main

Merge into:

lp://qastaging/~jflaker/ubuntu-manual/FixBug1358406

Diff against target:

1235736 lines (has conflicts)

Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file Makefile.  Moved existing file to Makefile.moved.
Conflict adding file backmatter.  Moved existing file to backmatter.moved.
Conflict adding file frontmatter.  Moved existing file to frontmatter.moved.
Conflict adding file graphics.  Moved existing file to graphics.moved.
Conflict adding file installation.  Moved existing file to installation.moved.
Conflict adding file langcodes.txt.  Moved existing file to langcodes.txt.moved.
Conflict adding file learning-more.  Moved existing file to learning-more.moved.
Conflict adding file pkgs.  Moved existing file to pkgs.moved.
Conflict adding file po.  Moved existing file to po.moved.
Conflict adding file po4a.conf.  Moved existing file to po4a.conf.moved.
Conflict adding file screenshots.  Moved existing file to screenshots.moved.
Conflict adding file titlepage.  Moved existing file to titlepage.moved.
Conflict adding file troubleshooting.  Moved existing file to troubleshooting.moved.
Conflict adding file tufte-book.cls.  Moved existing file to tufte-book.cls.moved.
Conflict adding file tufte-common.def.  Moved existing file to tufte-common.def.moved.
Conflict adding file ubuntu-manual.cls.  Moved existing file to ubuntu-manual.cls.moved.
Conflict adding file um-arabic.clo.  Moved existing file to um-arabic.clo.moved.
Conflict adding file um-bengali.clo.  Moved existing file to um-bengali.clo.moved.
Conflict adding file um-czech.clo.  Moved existing file to um-czech.clo.moved.
Conflict adding file um-dutch.clo.  Moved existing file to um-dutch.clo.moved.
Conflict adding file um-farsi.clo.  Moved existing file to um-farsi.clo.moved.
Conflict adding file um-german.clo.  Moved existing file to um-german.clo.moved.
Conflict adding file um-greek.clo.  Moved existing file to um-greek.clo.moved.
Conflict adding file um-hebrew.clo.  Moved existing file to um-hebrew.clo.moved.
Conflict adding file um-hindi.clo.  Moved existing file to um-hindi.clo.moved.
Conflict adding file um-japanese.clo.  Moved existing file to um-japanese.clo.moved.
Conflict adding file um-marathi.clo.  Moved existing file to um-marathi.clo.moved.
Conflict adding file um-tamil.clo.  Moved existing file to um-tamil.clo.moved.
Conflict adding file um-telugu.clo.  Moved existing file to um-telugu.clo.moved.
Conflict adding file um-template.clo.  Moved existing file to um-template.clo.moved.
Conflict adding file um-thai.clo.  Moved existing file to um-thai.clo.moved.
Conflict adding file um-vietnamese.clo.  Moved existing file to um-vietnamese.clo.moved.

To merge this branch:

bzr merge lp://qastaging/~ubuntu-manual/ubuntu-manual/main

Related bugs:

Bug #513835: Link to community help pages for hardware issues	Medium	Fix Released
Bug #522356: LaTex-Formatting-Bug	Undecided	Fix Released
Bug #532747: ubuntu recovery instructions don't work	Medium	Fix Released

Link a bug report

Related blueprints:

Alpha release for Ubuntu Manual (Essential)

Chapter 3 - Default Applications (High)

Chapter 8 - Troubleshooting (Medium)

Reviewer	Review Type	Date Requested	Status
Jeffrey Flaker			Pending
Review via email: mp+232844@code.qastaging.launchpad.net

Description of the change

there is a single place where "Ubuntu Software Center" was called "Ubuntu Software centre". To be consistent with many other mentions of Ubuntu Software Center, it was changed

Unmerged revisions

935. By Kevin Godby on 2011-05-15: * Updating Galician translation.
934. By Kevin Godby on 2010-12-23: Dutch wrap-around cover:
* Fixed logo file path.
* Updated spine text.
* Generated PDF for Lulu.com.
933. By Kevin Godby on 2010-12-23: * Added code-page info to the langcodes.txt file.
932. By Kevin Godby on 2010-12-23: More work on the Dutch translation:
* Pulled in Hannie's quotation marks fixes.
* Fixed some index entries (removed duplicates).
931. By Kevin Godby on 2010-12-09: * Still working on the Dutch translation:
* Fixed running head style.
* Fixed some errors that Hannie found.
930. By thorwil on 2010-12-09: Dutch Lulu cover SVG ready.
929. By thorwil on 2010-12-09: Add Dutch Lulu cover SVG.
928. By Kevin Godby on 2010-12-09: * Adding half-title page to the Dutch translation (print version).
927. By Kevin Godby on 2010-12-09: * Rejiggered polyglossia and glossaries packages so that they work together better.
* Fixed the TOC entry for the Dutch glossary.
926. By Kevin Godby on 2010-12-09: * Translated "License" to Dutch.
* Translated colophon text to Dutch.