diff --git a/django/conf/app_template/urls/__init__.py b/django/conf/app_template/urls/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/conf/app_template/urls/app_name.py b/django/conf/app_template/urls/app_name.py deleted file mode 100644 index de814a56d1..0000000000 --- a/django/conf/app_template/urls/app_name.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.conf.urls.defaults import * - -urlpatterns = patterns('{{ project_name }}.apps.{{ app_name }}.views', -# (r'', ''), -) diff --git a/docs/tutorial01.txt b/docs/tutorial01.txt index 60f370e5a9..b53dea1634 100644 --- a/docs/tutorial01.txt +++ b/docs/tutorial01.txt @@ -122,9 +122,6 @@ That'll create a directory structure like this:: models/ __init__.py polls.py - urls/ - __init__.py - polls.py views/ __init__.py diff --git a/docs/tutorial03.txt b/docs/tutorial03.txt index 5b42c960fe..57d411c157 100644 --- a/docs/tutorial03.txt +++ b/docs/tutorial03.txt @@ -369,9 +369,10 @@ We've been editing the URLs in ``myproject/settings/urls/main.py``, but the URL design of an app is specific to the app, not to the Django installation -- so let's move the URLs within the app directory. -Just copy the file ``myproject/settings/urls/main.py`` to -``myproject/apps/polls/urls/polls.py``, which had already been created, as a -stub, by ``django-admin.py startapp``. +Create a directory ``myproject/apps/polls/urls/``, and put a blank file called +``__init__.py`` into it. (The ``__init__.py`` file is necessary for Python to +treat the directory as a package.) Then copy the file +``myproject/settings/urls/main.py`` to ``myproject/apps/polls/urls/polls.py``. Then, change ``myproject/settings/urls/main.py`` to remove the poll-specific URLs and insert an ``include()``::