Merge lp://staging/~gary/launchpad/apidoc into lp://staging/launchpad
| Status: | Merged |
|---|---|
| Approved by: | Aaron Bentley |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 11235 |
| Proposed branch: | lp://staging/~gary/launchpad/apidoc |
| Merge into: | lp://staging/launchpad |
| Diff against target: |
143 lines (+60/-9) 3 files modified
configs/development/apidoc-configure-normal.zcml (+36/-4) lib/canonical/launchpad/security.py (+15/-2) lib/lp/services/doc/sprites.txt (+9/-3) |
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/apidoc |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Aaron Bentley (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix the integration of the "Book" section of the apidoc.
Description of the change
This branch fixes the integration of the "Book" section of the apidoc.
In order to show its potential usefulness, I added a few files in the Launchpad tree that actually seemed like reasonably up-to-date documentation. I'm hoping we can expose some of the lazr.restful documents soon as well, and perhaps, when we make a static version of this, this can be a place to aggregate and publish the files in the tree that we actually consider to be documentation.
I fixed up some ReST in a fly-by, so that it would render nicely in the browser.
I also changed the apidoc-specific permissions to be a bit more careful: only allow them when we are in devmode. I considered moving them out to a separate module so that they could be grokked only when the apidoc zcml is parsed, but did not do it, both because of inertia and because of no clear location for such a file.
When I added a couple of module inclusions in the apidoc zcml, I reordered the includes to put the meta files first, as is usually done.
| Aaron Bentley (abentley) | # |
