Merge lp://staging/~notnownikki/ubuntu-friendly/uf-docs-and-makefile into lp://staging/ubuntu-friendly
Proposed by
Nicola Heald
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~notnownikki/ubuntu-friendly/uf-docs-and-makefile |
| Merge into: | lp://staging/ubuntu-friendly |
| Diff against target: |
985 lines (+814/-62) 18 files modified
.bzrignore (+29/-2) Makefile (+104/-0) README (+13/-0) apps/local_settings.py.example (+18/-0) apps/manage.py (+1/-1) apps/minidetector/tests/__init__.py (+3/-0) apps/settings.py (+1/-0) docs/Makefile (+153/-0) docs/conf.py (+242/-0) docs/contributing.rst (+15/-0) docs/hacking.rst (+67/-0) docs/hacking.txt (+0/-59) docs/index.rst (+19/-0) docs/installing.rst (+38/-0) docs/running.rst (+59/-0) docs/schema_changes.text (+1/-0) docs/testing.rst (+37/-0) requirements.txt (+14/-0) |
| To merge this branch: | bzr merge lp://staging/~notnownikki/ubuntu-friendly/uf-docs-and-makefile |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Murphy (community) | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-05-11.
Description of the change
Used HEXR as a template for the documentation and Makefile.
Couple of tweaks made to the Makefile, make settings will not obliterate an exsisting local_settings.py, and make clean will remove an existing local_settings.py
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
testing.rst refers to exr.