Merge lp://staging/~notnownikki/ubuntu-friendly/uf-docs-and-makefile into lp://staging/ubuntu-friendly

testing.rst refers to exr.

1. The changes to .bzrignore are probably not helpful - it will quickly become incorrect/out of date as people add things with 'bzr ignore'.
2. You ignore docs/_build/*. What about docs/_static, docs/_templates? Are those produced in doc build process? If so, they should be ignored as well. Additionally, I suggest ignoring the directories too and not adding them to the bzr branch.
4. Instead of cding into docs/ to run makefile, use the --directory option.
5. You should not call make directly but instead use $(MAKE)
6. What's the change to 'apps/minidetector/tests/__init__.py' about?
7. The change to 'apps/settings.py' looks incorrect/inadvertent - you're assigning a value to DATABASE_USER after a value has already been assigned. Did you mean to do this or did you forget to remove the existing assignment to DATABASE_USER?
8. In docs/hacking.rst, I recommend using 'lp:ubuntu-friendly' to refer to trunk instead of 'lp:~ubuntu-friendly-control/ubuntu-friendly/trunk' as the former is less likely to become incorrect compared to the latter.

> 1. The changes to .bzrignore are probably not helpful - it will quickly become
> incorrect/out of date as people add things with 'bzr ignore'.

I guess to some people it's not helpful, but to new devs it will be. It's a good baseline at any rate.

> 2. You ignore docs/_build/*. What about docs/_static, docs/_templates? Are
> those produced in doc build process? If so, they should be ignored as well.

They're not produced by the build, they are for custom static assets and templates to go in if we want to change the look of the generated docs, so they're just there as placeholders until we want to do that.

> 4. Instead of cding into docs/ to run makefile, use the --directory option.
> 5. You should not call make directly but instead use $(MAKE)

Cool, will add those.

> 6. What's the change to 'apps/minidetector/tests/__init__.py' about?

Django 1.3 does more with the request during testing than Django 1.1, so the dummy request in the minidetector tests needed those attributes to pass under 1.3

> 7. The change to 'apps/settings.py' looks incorrect/inadvertent - you're
> assigning a value to DATABASE_USER after a value has already been assigned.
> Did you mean to do this or did you forget to remove the existing assignment to
> DATABASE_USER?

Well caught. Whoops!

> 8. In docs/hacking.rst, I recommend using 'lp:ubuntu-friendly' to refer to
> trunk instead of 'lp:~ubuntu-friendly-control/ubuntu-friendly/trunk' as the
> former is less likely to become incorrect compared to the latter.

Changed.

testing.rst still refers to exr :)