Ubuntu Manual

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

FixBug1358406
Merge into main

Proposed by Jeffrey Flaker on 2014-09-01

Status:

Superseded

Proposed branch:

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

Merge into:

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

Diff against target:

73779 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/~jflaker/ubuntu-manual/FixBug1358406

Related bugs:

Bug #1358406: Misspelling in #1302

Undecided

Fix Committed

Link a bug report

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

This proposal has been superseded by a proposal from 2014-10-08.

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

~jflaker/ubuntu-manual/FixBug1358406

Unmerged revisions

105. By Jeffrey Flaker on 2014-09-01: Fixing bug 1358406
This is the single place where "Ubuntu Software Center" was called "Ubuntu Software centre". To be consistent, it was changed
104. By Jose Luis Tirado on 2014-08-31: Spanish screenshots
103. By Sylvie Gallet on 2014-08-24: Edited credits.tex
102. By Kevin Godby on 2014-08-16: Updated translation template file.
101. By Kevin Godby on 2014-08-13: Updated title page PDF (properly kerned now).
100. By Kevin Godby on 2014-08-12: Moved title on titlepage to different layer so half-title page script would work properly.
99. By thorwil on 2014-08-11: Kern '14.04'.
98. By thorwil on 2014-08-11: Titlepage 'lulu' to 'double'.
97. By thorwil on 2014-08-11: Titlepage 'lulu' to 'double'.
96. By Hannie Dumoleyn on 2014-08-10: correction section Wireless (ISP)