1.0 Url Include Documenation

[Scott Watermasysk]

I found the documentation on setting up an include file for urls a little confusing for a new django user: ​http://docs.djangoproject.com/en/1.0/intro/tutorial03/#intro-tutorial03

The part I got tripped up on was code sample:

(r'^{polls/', include('mysite.polls.urls')),}

It was not apparent to me until after I read the docs here ​http://docs.djangoproject.com/en/dev/topics/http/urls/ that the include was supposed to be part of the urlpatterns.

I mistakenly just added the include statement above and was greated with the error message, "'module' object has no attribute 'urlpatterns'". It could be just me, but I would recommend either expanding the code sample to include the urlpatterns or add a note about this potential error message.

[Russell Keith-Magee]

(In [11052]) Fixed #10978 -- Clarified that the include statement is part of the urlpattern definition. Thanks to swatermasysk for the suggestion.

[Russell Keith-Magee]

(In [11064]) [1.0.X] Fixed #10978 -- Clarified that the include statement is part of the urlpattern definition. Thanks to swatermasysk for the suggestion.

Merge of r11052 from trunk.