← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/conf.py

  • Committer: Robert Collins
  • Date: 2009-12-15 23:28:24 UTC
  • mfrom: (4900 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4920.
  • Revision ID: robertc@robertcollins.net-20091215232824-yewvn7pn7baaevux
Merge trunk, resolving NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/conf.py
73
73
 
74
74
# List of documents that shouldn't be included in the build.
75
75
unused_docs = [
76
 
    # Placeholder for later
77
 
    'admin-guide/index',
78
76
    # Subtopics that get included
79
77
    'upgrade-guide/overview',
80
78
    'upgrade-guide/data_migration',