Merge lp://staging/~davewalker/serverguide/moin-alias-refresh into lp://staging/~ubuntu-core-doc/serverguide/oneiric

Proposed by Dave Walker
Status: Rejected
Rejected by: Connor Imes
Proposed branch: lp://staging/~davewalker/serverguide/moin-alias-refresh
Merge into: lp://staging/~ubuntu-core-doc/serverguide/oneiric
Diff against target: 1545 lines (+149/-149)
63 files modified
serverguide/C/lamp-applications.xml (+2/-2)
serverguide/po/ace.po (+2/-2)
serverguide/po/ar.po (+2/-2)
serverguide/po/ast.po (+2/-2)
serverguide/po/be.po (+2/-2)
serverguide/po/bg.po (+2/-2)
serverguide/po/bn.po (+2/-2)
serverguide/po/bs.po (+2/-2)
serverguide/po/ca.po (+2/-2)
serverguide/po/cs.po (+2/-2)
serverguide/po/da.po (+2/-2)
serverguide/po/de.po (+4/-4)
serverguide/po/el.po (+4/-4)
serverguide/po/en_AU.po (+4/-4)
serverguide/po/en_CA.po (+2/-2)
serverguide/po/en_GB.po (+4/-4)
serverguide/po/eo.po (+2/-2)
serverguide/po/es.po (+4/-4)
serverguide/po/et.po (+2/-2)
serverguide/po/eu.po (+2/-2)
serverguide/po/fa.po (+2/-2)
serverguide/po/fi.po (+2/-2)
serverguide/po/fr.po (+3/-3)
serverguide/po/gl.po (+2/-2)
serverguide/po/gu.po (+2/-2)
serverguide/po/he.po (+2/-2)
serverguide/po/hr.po (+2/-2)
serverguide/po/hu.po (+4/-4)
serverguide/po/id.po (+2/-2)
serverguide/po/is.po (+2/-2)
serverguide/po/it.po (+4/-4)
serverguide/po/ja.po (+2/-2)
serverguide/po/km.po (+2/-2)
serverguide/po/ko.po (+2/-2)
serverguide/po/ku.po (+2/-2)
serverguide/po/lo.po (+2/-2)
serverguide/po/lt.po (+2/-2)
serverguide/po/mk.po (+2/-2)
serverguide/po/ms.po (+2/-2)
serverguide/po/nb.po (+2/-2)
serverguide/po/nl.po (+2/-2)
serverguide/po/oc.po (+2/-2)
serverguide/po/pl.po (+2/-2)
serverguide/po/ps.po (+2/-2)
serverguide/po/pt.po (+2/-2)
serverguide/po/pt_BR.po (+4/-4)
serverguide/po/ro.po (+2/-2)
serverguide/po/ru.po (+2/-2)
serverguide/po/serverguide.pot (+2/-2)
serverguide/po/sk.po (+4/-4)
serverguide/po/sl.po (+2/-2)
serverguide/po/sq.po (+2/-2)
serverguide/po/sr.po (+2/-2)
serverguide/po/sv.po (+4/-4)
serverguide/po/th.po (+2/-2)
serverguide/po/tl.po (+2/-2)
serverguide/po/tr.po (+4/-4)
serverguide/po/ug.po (+2/-2)
serverguide/po/uk.po (+2/-2)
serverguide/po/ur.po (+2/-2)
serverguide/po/vi.po (+2/-2)
serverguide/po/zh_CN.po (+2/-2)
serverguide/po/zh_TW.po (+2/-2)
To merge this branch: bzr merge lp://staging/~davewalker/serverguide/moin-alias-refresh
Reviewer Review Type Date Requested Status
Peter Matulis (community) Approve
Review via email: mp+84745@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Peter Matulis (petermatulis) wrote :

Looks good.

review: Approve
Revision history for this message
Matthew East (mdke) wrote :

Please don't amend po files, they are exported from Launchpad and should not be edited in the bzr branch. Only the xml files need to be touched.

Revision history for this message
Connor Imes (ckimes) wrote :

Thanks for your work. It looks like this was either merged or fixed separately in the Precise branch, so I'm going to reject this merge proposal. We just won't be fixing it in the Oneiric docs.

Unmerged revisions

34. By Dave Walker

Update moinmoin apache vhost config alias, which was outdated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches