← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/doc/publishing.txt

Committer: Ian Booth
Date: 2011-04-05 12:10:01 UTC
mfrom: (12746 devel)
mto: (12641.6.16 assign-non-contributor)
mto: This revision was merged to the branch mainline in revision 12755.
Revision ID: ian.booth@canonical.com-20110405121001-in112i69zxq8nmwg

Fix merge conflicts and merge from trunk

files added:
lib/lp/registry/help/distribution-add-series.html

lib/lp/registry/templates/distroseries-add.pt

files modified:
lib/canonical/launchpad/testing/systemdocs.py

lib/lp/app/browser/launchpadform.py

lib/lp/app/browser/tests/test_launchpadform.py

lib/lp/app/templates/launchpad-form.pt

lib/lp/code/browser/tests/test_recipebuildslisting.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/tests/distroseries-views.txt

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/javascript/distroseriesdifferences_details.js

lib/lp/registry/javascript/structural-subscription.js

lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.js

lib/lp/registry/javascript/tests/test_structural_subscription.js

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/soyuz/doc/publishing.txt

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/tests/test_publish_archive_indexes.py

lib/lp/soyuz/tests/test_publishing.py

versions.cfg

Show diffs side-by-side

added added

removed removed

lib/lp/soyuz/doc/publishing.txt

923

923

924

924

>>> print bpph.getIndexStanza() #doctest: -NORMALIZE_WHITESPACE

925

925

Package: mozilla-firefox

926

Source: mozilla-firefox

927

926

Priority: important

928

927

Section: editors

929

928

Maintainer: Mark Shuttleworth <mark@canonical.com>

Older »