Merge lp:~jml/launchpad/silence-sphinx-errors-and-warnings into lp:launchpad

Proposed by Jonathan Lange
Status: Merged
Approved by: Данило Шеган
Approved revision: no longer in the source branch.
Merged at revision: 12394
Proposed branch: lp:~jml/launchpad/silence-sphinx-errors-and-warnings
Merge into: lp:launchpad
Diff against target: 272 lines (+92/-34)
7 files modified
doc/buildout.txt (+1/-1)
doc/chameleon.txt (+3/-2)
doc/historical.txt (+16/-0)
doc/index.txt (+38/-8)
doc/malone.txt (+31/-20)
doc/security.txt (+2/-2)
doc/webapp-process.txt (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/silence-sphinx-errors-and-warnings
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Review via email: mp+49965@code.launchpad.net

Commit message

Fix rST and Sphinx errors in our top-level docs, and make the main page more interesting.

Description of the change

Fixes up the documentation in doc/ so that 'make -C doc html' builds successfully without producing any warnings. Also changes the index page to be a little nicer and more structured.

I've tweaked the formatting of some of the old docs so they are a little more rST-friendly, but I haven't gone overboard. I also haven't exercised much editorial power, other than imposing some kind of organization on the docs.

I'll land a branch in future that prevents new documentation warnings. Such a change should be fairly unintrusive, since it will only affect people editing documentation, who should be getting it right anyway.

To test, run::
  make -C doc html

The documentation can be viewed in your browser in doc/_build/html/index.html.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Thanks for the branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/buildout.txt'
--- doc/buildout.txt 2010-07-25 17:47:41 +0000
+++ doc/buildout.txt 2011-02-16 14:43:33 +0000
@@ -599,7 +599,7 @@
599being picked up instantly without us having to create a distribution.599being picked up instantly without us having to create a distribution.
600600
601To do this add the extra paths to the ``develop`` key in the ``[buildout]``601To do this add the extra paths to the ``develop`` key in the ``[buildout]``
602section of ``buildout.cfg"::602section of ``buildout.cfg``::
603603
604 [buildout]604 [buildout]
605 develop = .605 develop = .
606606
=== modified file 'doc/chameleon.txt'
--- doc/chameleon.txt 2009-05-27 22:32:01 +0000
+++ doc/chameleon.txt 2011-02-16 14:43:33 +0000
@@ -1,7 +1,7 @@
1Running Launchpad with Chameleon Template Engine1Running Launchpad with Chameleon Template Engine
2================================================2================================================
33
4- Need to pull the following dependencies into ``sourcecode``::4- Need to pull the following dependencies into ``sourcecode``:
55
6 - lp:sourcecodegen/trunk6 - lp:sourcecodegen/trunk
7 - lp:chameleon.core/trunk7 - lp:chameleon.core/trunk
@@ -14,7 +14,8 @@
14 ``z3c.pt`` and use ``zope.pagetemplate`` instead. Yes, it's that14 ``z3c.pt`` and use ``zope.pagetemplate`` instead. Yes, it's that
15 simple. This is possible thanks to ``z3c.ptcompat``.15 simple. This is possible thanks to ``z3c.ptcompat``.
1616
17- Other useful environment options for ``z3c.pt``::17
18Other useful environment options for ``z3c.pt``::
1819
19 # in debug-mode, templates on disk are reloaded if they're modified20 # in debug-mode, templates on disk are reloaded if they're modified
20 CHAMELEON_DEBUG (default: false)21 CHAMELEON_DEBUG (default: false)
2122
=== added file 'doc/historical.txt'
--- doc/historical.txt 1970-01-01 00:00:00 +0000
+++ doc/historical.txt 2011-02-16 14:43:33 +0000
@@ -0,0 +1,16 @@
1================================
2Documents of historical interest
3================================
4
5The following documents don't really represent current thinking or development
6practices, but are useful to have around to get a sense of where we've been
7and how we've progressed.
8
9Contents:
10
11.. toctree::
12 :maxdepth: 1
13
14 chameleon
15 malone
16 webapp-process
017
=== modified file 'doc/index.txt'
--- doc/index.txt 2011-02-03 16:06:59 +0000
+++ doc/index.txt 2011-02-16 14:43:33 +0000
@@ -3,17 +3,47 @@
3 You can adapt this file completely to your liking, but it should at least3 You can adapt this file completely to your liking, but it should at least
4 contain the root `toctree` directive.4 contain the root `toctree` directive.
55
6=================================
6Launchpad developer documentation7Launchpad developer documentation
7=================================8=================================
89
9Contents:10Welcome to the Launchpad developer documentation. This documentation is for
1011people who want to hack on Launchpad.
11.. toctree::12
12 :maxdepth: 113Overview
1314========
14 README <readme>15
15 Launchpad Vision <vision>16.. toctree::
16 Launchpad Values <values>17 :maxdepth: 1
18
19 readme
20 vision
21 values
22
23Technical
24=========
25
26.. toctree::
27 :maxdepth: 1
28
29 buildout
30
31Possibly out-of-date
32--------------------
33
34.. toctree::
35 :maxdepth: 1
36
37 security
38 email
39
40Other
41=====
42
43.. toctree::
44 :maxdepth: 1
45
46 historical
1747
1848
19Indices and tables49Indices and tables
2050
=== modified file 'doc/malone.txt'
--- doc/malone.txt 2007-10-31 19:03:15 +0000
+++ doc/malone.txt 2011-02-16 14:43:33 +0000
@@ -1,3 +1,6 @@
1============
2About Malone
3============
14
2The world has many excellent bug tracking tools already. It would not make5The world has many excellent bug tracking tools already. It would not make
3sense to create another bugtracker unless the vision behind that software6sense to create another bugtracker unless the vision behind that software
@@ -6,6 +9,7 @@
6do for the open source community.9do for the open source community.
710
8The Vision behind Malone11The Vision behind Malone
12========================
913
10Malone is a unified bug tracker for the entire open source world. It is14Malone is a unified bug tracker for the entire open source world. It is
11designed to allow the whole open source community to collaborate on software15designed to allow the whole open source community to collaborate on software
@@ -15,15 +19,16 @@
15specific software defect.19specific software defect.
1620
17Upstream and Distributions21Upstream and Distributions
22==========================
1823
19A unique feature of Malone is that it understands the structure of the open24A unique feature of Malone is that it understands the structure of the open
20source community:25source community::
2126
22 Software is developed by individuals or groups with a common interest in a27 Software is developed by individuals or groups with a common interest in a
23 specific problem. We call this group "upstream". That software is28 specific problem. We call this group "upstream". That software is
24 distributed in its pristine state ("tarballs", usually) and is usually29 distributed in its pristine state ("tarballs", usually) and is usually
25 designed to be compiled and run on a variety of platforms.30 designed to be compiled and run on a variety of platforms.
26 31
27 However, most people who use that software will not get it directly from32 However, most people who use that software will not get it directly from
28 upstream, build it and install it locally. They will install a package33 upstream, build it and install it locally. They will install a package
29 that has already been prepared for the specific platform they are running34 that has already been prepared for the specific platform they are running
@@ -46,6 +51,7 @@
46information very prominently.51information very prominently.
4752
48Watches53Watches
54=======
4955
50It's unlikely that the whole world will shift to Malone. Many larger56It's unlikely that the whole world will shift to Malone. Many larger
51projects have their own bug tracking tools (Bugzilla, Sourceforge and57projects have their own bug tracking tools (Bugzilla, Sourceforge and
@@ -61,6 +67,7 @@
61would create a BugWatch in the Malone bug pointing at that upstream bug.67would create a BugWatch in the Malone bug pointing at that upstream bug.
6268
63Email Integration69Email Integration
70=================
6471
65It's important that Malone be usable entirely in email. Many open source72It's important that Malone be usable entirely in email. Many open source
66developers use their email to track work that needs to be done. So all of73developers use their email to track work that needs to be done. So all of
@@ -69,6 +76,7 @@
69reports of bugs on a product or distrbution.76reports of bugs on a product or distrbution.
7077
71Distribution Bugs78Distribution Bugs
79=================
7280
73Malone is designed to track bugs upstream, and in distributions. The81Malone is designed to track bugs upstream, and in distributions. The
74requirements for a distribution bugtracker are somewhat specialised. A82requirements for a distribution bugtracker are somewhat specialised. A
@@ -83,6 +91,7 @@
83also the precise binary package that manifests the bug.91also the precise binary package that manifests the bug.
8492
85Milestones and DistroSeries93Milestones and DistroSeries
94===========================
8695
87In addition, it's important to be able to know which bugs need to be fix for96In addition, it's important to be able to know which bugs need to be fix for
88a given release of the distribution, or a given milestone upstream. Malone97a given release of the distribution, or a given milestone upstream. Malone
@@ -91,6 +100,7 @@
91making towards a release.100making towards a release.
92101
93Version Tracking102Version Tracking
103================
94104
95One very difficult problem faced by support teams in the open source world105One very difficult problem faced by support teams in the open source world
96is that users may not all be running the latest version of a piece of code.106is that users may not all be running the latest version of a piece of code.
@@ -98,23 +108,24 @@
98whether a bug is found in a particular version of a package or not.108whether a bug is found in a particular version of a package or not.
99109
100Future110Future
101111======
102 1. Bazaar Integration112
103 Malone is part of Launchpad, a web based portal for open source113Bazaar Integration
104 developers. Another component of that portal is the Bazaar, a repository114------------------
105 of data and metadata about code stored in the Bazaar revision control115
106 system. We hope that Bazaar will be embraced by the open source world,116Malone is part of Launchpad, a web based portal for open source
107 as it solves a number of problems with traditional centralised revision117developers. Another component of that portal is the Bazaar, a repository of
108 control systems and is again designed to support distributed118data and metadata about code stored in the Bazaar revision control system. We
109 disconnected operation.119hope that Bazaar will be embraced by the open source world, as it solves a
110120number of problems with traditional centralised revision control systems and
111 Once more people start keeping their code in Bazaar, it should become121is again designed to support distributed disconnected operation.
112 possible to streamline the cooperation process even further. For122
113 example, if the fix for a particular Malone bug can be found in a Bazaar123Once more people start keeping their code in Bazaar, it should become possible
114 changeset, then it should be possible for upstream and other124to streamline the cooperation process even further. For example, if the fix
115 distributions to merge in that fix to their codebase automatically and125for a particular Malone bug can be found in a Bazaar changeset, then it should
116 easily. The integration could even be bidirectional - once a fix had been126be possible for upstream and other distributions to merge in that fix to their
117 merged in, Bazaar could possibly detect that and mark the bug fixed in127codebase automatically and easily. The integration could even be
118 that codebase automatically.128bidirectional - once a fix had been merged in, Bazaar could possibly detect
129that and mark the bug fixed in that codebase automatically.
119130
120131
121132
=== modified file 'doc/security.txt'
--- doc/security.txt 2011-02-04 16:53:06 +0000
+++ doc/security.txt 2011-02-16 14:43:33 +0000
@@ -38,7 +38,7 @@
3838
391. Define the adapter in lib/canonical/launchpad/security.py. Here's a simple391. Define the adapter in lib/canonical/launchpad/security.py. Here's a simple
40example of an adapter that authorizes only an object owner for the40example of an adapter that authorizes only an object owner for the
41launchpad.Edit permission on objects that implement the IHasOwner interface:41launchpad.Edit permission on objects that implement the IHasOwner interface::
4242
43 class EditByOwner(AuthorizationBase):43 class EditByOwner(AuthorizationBase):
44 permission = 'launchpad.Edit'44 permission = 'launchpad.Edit'
@@ -54,7 +54,7 @@
5454
552. Declare the permission on a given interface in a zcml file. So, for the552. Declare the permission on a given interface in a zcml file. So, for the
56above adapter, here's how it's hooked up to IProduct, where IProduct is56above adapter, here's how it's hooked up to IProduct, where IProduct is
57protected with the launchpad.Edit permission:57protected with the launchpad.Edit permission::
5858
59 <class59 <class
60 class="lp.registry.model.product.Product">60 class="lp.registry.model.product.Product">
6161
=== modified file 'doc/webapp-process.txt'
--- doc/webapp-process.txt 2010-02-17 11:13:06 +0000
+++ doc/webapp-process.txt 2011-02-16 14:43:33 +0000
@@ -194,7 +194,7 @@
194194
195We need to know what types of things are at a particular URL. Here's an195We need to know what types of things are at a particular URL. Here's an
196example of a typical URL in a web application. This time, I've included196example of a typical URL in a web application. This time, I've included
197the "rosetta" path segment at the root.197the "rosetta" path segment at the root::
198198
199 /rosetta/projects/$PACKAGENAME/teams/$TEAM/add-member.html199 /rosetta/projects/$PACKAGENAME/teams/$TEAM/add-member.html
200 | | | | | |200 | | | | | |