Update example urls.py to match the one created by django-admin.py
update example 2
Continuing to update example to match new version of django-admin.py
Update the import to match the example.
Update the example to be consistent.
Update python 2.4 to 2.7
Update settings.py location and do not reference DATABASE_NAME, which is not in settings.py anymore.
rewrap paragraph
updating urls.py example again.
web is not a proper noun
The default urlconf generated by django-admin includes the url() function and raw strings, so I think we should bring them up earlier.  Otherwise, new readers may be confused by the discrepancy.
Update another urlconf example.
Another urlconf
updated more urlconf examples; made note to cover url() optional arguments (like name=) in Chapter 8
Use active, not passive voice.
pluralize function
Fix RST note syntax.
Since we are using the url function, we are not just adding a "python tuple" anymore
This admonition makes more sense after we have written the view.
Merge branch 'master' into chapter03