Django

Code

Changeset 4426

Show
Ignore:
Timestamp:
01/24/07 20:15:39 (2 years ago)
Author:
adrian
Message:

newforms-admin: Merged to [4425]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin/django/contrib/sessions/middleware.py

    r4265 r4426  
    11from django.conf import settings 
    22from django.contrib.sessions.models import Session 
     3from django.core.exceptions import SuspiciousOperation 
    34from django.utils.cache import patch_vary_headers 
    45import datetime 
     
    5657                        expire_date__gt=datetime.datetime.now()) 
    5758                    self._session_cache = s.get_decoded() 
    58                 except Session.DoesNotExist
     59                except (Session.DoesNotExist, SuspiciousOperation)
    5960                    self._session_cache = {} 
    6061                    # Set the session_key to None to force creation of a new 
  • django/branches/newforms-admin/django/core/management.py

    r4343 r4426  
    2626PROJECT_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf', '%s_template') 
    2727 
    28 INVALID_PROJECT_NAMES = ('django', 'test') 
     28INVALID_PROJECT_NAMES = ('django', 'site', 'test') 
    2929 
    3030# Set up the terminal color scheme. 
     
    709709    from random import choice 
    710710    if project_name in INVALID_PROJECT_NAMES: 
    711         sys.stderr.write(style.ERROR("Error: %r isn't a valid project name. Please try another.\n" % project_name)) 
     711        sys.stderr.write(style.ERROR("Error: '%r' conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name.\n" % project_name)) 
    712712        sys.exit(1) 
    713713    _start_helper('project', project_name, directory) 
  • django/branches/newforms-admin/django/oldforms/__init__.py

    r4400 r4426  
    959959 
    960960    def html2python(data): 
    961         return data.upper() # Should always be stored in upper case 
     961        if data: 
     962            return data.upper() # Should always be stored in upper case 
     963        return data 
    962964    html2python = staticmethod(html2python) 
    963965 
  • django/branches/newforms-admin/docs/add_ons.txt

    r4164 r4426  
    1818`Tutorial 2`_. 
    1919 
    20 .. _Tutorial 2: http://www.djangoproject.com/documentation/tutorial2/ 
     20.. _Tutorial 2: ../tutorial2/ 
    2121 
    2222auth 
     
    2727See the `authentication documentation`_. 
    2828 
    29 .. _authentication documentation: http://www.djangoproject.com/documentation/authentication/ 
     29.. _authentication documentation: ../authentication/ 
    3030 
    3131comments 
     
    4747See the `csrf documentation`_. 
    4848 
    49 .. _csrf documentation: http://www.djangoproject.com/documentation/csrf/ 
     49.. _csrf documentation: ../csrf/ 
    5050 
    5151formtools 
     
    138138See the `flatpages documentation`_. 
    139139 
    140 .. _flatpages documentation: http://www.djangoproject.com/documentation/flatpages/ 
     140.. _flatpages documentation: ../flatpages/ 
    141141 
    142142markup 
     
    158158See the `redirects documentation`_. 
    159159 
    160 .. _redirects documentation: http://www.djangoproject.com/documentation/redirects/ 
     160.. _redirects documentation: ../redirects/ 
    161161 
    162162sites 
     
    169169See the `sites documentation`_. 
    170170 
    171 .. _sites documentation: http://www.djangoproject.com/documentation/sites/ 
     171.. _sites documentation: ../sites/ 
    172172 
    173173sitemaps 
     
    178178See the `sitemaps documentation`_. 
    179179 
    180 .. _sitemaps documentation: http://www.djangoproject.com/documentation/sitemaps/ 
     180.. _sitemaps documentation: ../sitemaps/ 
    181181 
    182182syndication 
     
    187187See the `syndication documentation`_. 
    188188 
    189 .. _syndication documentation: http://www.djangoproject.com/documentation/syndication/ 
     189.. _syndication documentation: ../syndication/ 
    190190 
    191191Other add-ons 
  • django/branches/newforms-admin/docs/apache_auth.txt

    r3842 r4426  
    6666    PythonOption DJANGO_SETTINGS_MODULE mysite.settings 
    6767 
    68 .. _authentication system: http://www.djangoproject.com/documentation/authentication/ 
     68.. _authentication system: ../authentication/ 
    6969.. _Subversion: http://subversion.tigris.org/ 
    7070.. _mod_dav: http://httpd.apache.org/docs/2.0/mod/mod_dav.html 
    71 .. _custom permissions: http://www.djangoproject.com/documentation/authentication/#custom-permissions 
     71.. _custom permissions: ../authentication/#custom-permissions 
  • django/branches/newforms-admin/docs/api_stability.txt

    r3883 r4426  
    9999     there will at least be moderate changes. 
    100100      
    101 .. _caching: http://www.djangoproject.com/documentation/cache/ 
    102 .. _custom template tags and libraries: http://www.djangoproject.com/documentation/templates_python/ 
    103 .. _database lookup: http://www.djangoproject.com/documentation/db_api/ 
    104 .. _django-admin utility: http://www.djangoproject.com/documentation/django_admin/ 
    105 .. _fastcgi integration: http://www.djangoproject.com/documentation/fastcgi/ 
    106 .. _flatpages: http://www.djangoproject.com/documentation/flatpages/ 
    107 .. _generic views: http://www.djangoproject.com/documentation/generic_views/ 
    108 .. _internationalization: http://www.djangoproject.com/documentation/i18n/ 
    109 .. _legacy database integration: http://www.djangoproject.com/documentation/legacy_databases/ 
    110 .. _model definition: http://www.djangoproject.com/documentation/model_api/ 
    111 .. _mod_python integration: http://www.djangoproject.com/documentation/modpython/ 
    112 .. _redirects: http://www.djangoproject.com/documentation/redirects/ 
    113 .. _request/response objects: http://www.djangoproject.com/documentation/request_response/ 
    114 .. _sending email: http://www.djangoproject.com/documentation/email/ 
    115 .. _sessions: http://www.djangoproject.com/documentation/sessions/ 
    116 .. _settings: http://www.djangoproject.com/documentation/settings/ 
    117 .. _syndication: http://www.djangoproject.com/documentation/syndication/ 
    118 .. _template language: http://www.djangoproject.com/documentation/templates/ 
    119 .. _transactions: http://www.djangoproject.com/documentation/transactions/ 
    120 .. _url dispatch: http://www.djangoproject.com/documentation/url_dispatch/ 
    121 .. _forms and validation: http://www.djangoproject.com/documentation/forms/ 
    122 .. _serialization: http://www.djangoproject.com/documentation/serialization/ 
    123 .. _authentication: http://www.djangoproject.com/documentation/authentication/ 
     101.. _caching: ../cache/ 
     102.. _custom template tags and libraries: ../templates_python/ 
     103.. _database lookup: ../db_api/ 
     104.. _django-admin utility: ../django_admin/ 
     105.. _fastcgi integration: ../fastcgi/ 
     106.. _flatpages: ../flatpages/ 
     107.. _generic views: ../generic_views/ 
     108.. _internationalization: ../i18n/ 
     109.. _legacy database integration: ../legacy_databases/ 
     110.. _model definition: ../model_api/ 
     111.. _mod_python integration: ../modpython/ 
     112.. _redirects: ../redirects/ 
     113.. _request/response objects: ../request_response/ 
     114.. _sending email: ../email/ 
     115.. _sessions: ../sessions/ 
     116.. _settings: ../settings/ 
     117.. _syndication: ../syndication/ 
     118.. _template language: ../templates/ 
     119.. _transactions: ../transactions/ 
     120.. _url dispatch: ../url_dispatch/ 
     121.. _forms and validation: ../forms/ 
     122.. _serialization: ../serialization/ 
     123.. _authentication: ../authentication/ 
  • django/branches/newforms-admin/docs/authentication.txt

    r3961 r4426  
    145145      doesn't allow profiles. 
    146146 
    147 .. _Django model: http://www.djangoproject.com/documentation/model_api/ 
    148 .. _DEFAULT_FROM_EMAIL: http://www.djangoproject.com/documentation/settings/#default-from-email 
     147.. _Django model: ../model_api/ 
     148.. _DEFAULT_FROM_EMAIL: ../settings/#default-from-email 
    149149 
    150150Manager functions 
     
    272272        # Do something for anonymous users. 
    273273 
    274 .. _request objects: http://www.djangoproject.com/documentation/request_response/#httprequest-objects 
    275 .. _session documentation: http://www.djangoproject.com/documentation/sessions/ 
     274.. _request objects: ../request_response/#httprequest-objects 
     275.. _session documentation: ../sessions/ 
    276276 
    277277How to log a user in 
     
    442442    {% endblock %} 
    443443 
    444 .. _forms documentation: http://www.djangoproject.com/documentation/forms/ 
    445 .. _site framework docs: http://www.djangoproject.com/documentation/sites/ 
     444.. _forms documentation: ../forms/ 
     445.. _site framework docs: ../sites/ 
    446446 
    447447Limiting access to logged-in users that pass a test 
     
    545545        return object_detail(*args, **kwargs) 
    546546 
    547 .. _generic view: http://www.djangoproject.com/documentation/generic_views/ 
     547.. _generic view: ../generic_views/ 
    548548 
    549549Permissions 
     
    607607``syncdb``. 
    608608 
    609 .. _model Meta attribute: http://www.djangoproject.com/documentation/model_api/#meta-options 
     609.. _model Meta attribute: ../model_api/#meta-options 
    610610 
    611611API reference 
     
    646646   For more, see the `RequestContext docs`_. 
    647647 
    648    .. _RequestContext docs: http://www.djangoproject.com/documentation/templates_python/#subclassing-context-requestcontext 
     648   .. _RequestContext docs: ../templates_python/#subclassing-context-requestcontext 
    649649 
    650650Users 
     
    692692    {% endif %} 
    693693 
    694 .. _template context: http://www.djangoproject.com/documentation/templates_python/ 
     694.. _template context: ../templates_python/ 
    695695 
    696696Groups 
     
    757757database. To send messages to anonymous users, use the `session framework`_. 
    758758 
    759 .. _session framework: http://www.djangoproject.com/documentation/sessions/ 
     759.. _session framework: ../sessions/ 
    760760 
    761761Other authentication sources 
  • django/branches/newforms-admin/docs/cache.txt

    r3604 r4426  
    251251See the `middleware documentation`_ for more on middleware. 
    252252 
    253 .. _`middleware documentation`: http://www.djangoproject.com/documentation/middleware/ 
     253.. _`middleware documentation`: ../middleware/ 
    254254 
    255255The per-view cache 
  • django/branches/newforms-admin/docs/contributing.txt

    r4350 r4426  
    233233 
    234234.. _Django i18n mailing list: http://groups.google.com/group/django-i18n/ 
    235 .. _i18n documentation: http://www.djangoproject.com/documentation/i18n/ 
     235.. _i18n documentation: ../i18n/ 
    236236 
    237237Coding style 
     
    358358how to write new tests. 
    359359 
    360 .. _Testing Django applications: http://www.djangoproject.com/documentation/testing/ 
     360.. _Testing Django applications: ../testing/ 
    361361 
    362362Running the unit tests 
     
    597597.. _list of tickets with patches: http://code.djangoproject.com/query?status=new&status=assigned&status=reopened&has_patch=1&order=priority 
    598598.. _PEP 8: http://www.python.org/peps/pep-0008.html 
    599 .. _i18n documentation: http://www.djangoproject.com/documentation/i18n/ 
    600599.. _i18n branch: http://code.djangoproject.com/browser/django/branches/i18n 
    601600.. _`tags/releases`: http://code.djangoproject.com/browser/django/tags/releases 
  • django/branches/newforms-admin/docs/design_philosophies.txt

    r3438 r4426  
    187187This is the philosophy behind `template inheritance`_. 
    188188 
    189 .. _template inheritance: http://www.djangoproject.com/documentation/templates/#template-inheritance 
     189.. _template inheritance: ./templates/#template-inheritance 
    190190 
    191191Be decoupled from HTML 
  • django/branches/newforms-admin/docs/django-admin.txt

    r3841 r4426  
    5454your admin's index page. See `Tutorial 2`_ for more information. 
    5555 
    56 .. _Tutorial 2: http://www.djangoproject.com/documentation/tutorial2/ 
     56.. _Tutorial 2: ../tutorial2/ 
    5757 
    5858createcachetable [tablename] 
     
    6262backend.  See the `cache documentation`_ for more information. 
    6363 
    64 .. _cache documentation: http://www.djangoproject.com/documentation/cache/ 
     64.. _cache documentation: ../cache/ 
    6565 
    6666dbshell 
     
    191191documentation. 
    192192 
    193 .. _serving static files: http://www.djangoproject.com/documentation/static_files/ 
     193.. _serving static files: ../static_files/ 
    194194 
    195195Turning off auto-reload 
     
    254254tables with any necessary initial records, SQL functions or test data. 
    255255 
     256Note that the order in which the SQL files are processed is undefined. 
     257 
    256258sqlreset [appname appname ...] 
    257259-------------------------------------- 
     
    381383    django-admin.py syncdb --verbosity=2 
    382384 
    383 Verbosity determines the amount of notification and debug information that  
     385Verbosity determines the amount of notification and debug information that 
    384386will be printed to the console. '0' is no output, '1' is normal output, 
    385387and `2` is verbose output. 
  • django/branches/newforms-admin/docs/email.txt

    r2901 r4426  
    102102This method exists for convenience and readability. 
    103103 
    104 .. _ADMINS setting: http://www.djangoproject.com/documentation/settings/#admins 
    105 .. _EMAIL_SUBJECT_PREFIX setting: http://www.djangoproject.com/documentation/settings/#email-subject-prefix 
    106 .. _SERVER_EMAIL setting: http://www.djangoproject.com/documentation/settings/#server-email 
     104.. _ADMINS setting: ../settings/#admins 
     105.. _EMAIL_SUBJECT_PREFIX setting: ../settings/#email-subject-prefix 
     106.. _SERVER_EMAIL setting: ../settings/#server-email 
    107107 
    108108mail_managers() function 
     
    115115    mail_managers(subject, message, fail_silently=False) 
    116116 
    117 .. _MANAGERS setting: http://www.djangoproject.com/documentation/settings/#managers 
     117.. _MANAGERS setting: ../settings/#managers 
    118118 
    119119Examples 
  • django/branches/newforms-admin/docs/faq.txt

    r3917 r4426  
    6464application layer. And it ships with a simple-yet-powerful `cache framework`_. 
    6565 
    66 .. _`cache framework`: http://www.djangoproject.com/documentation/cache/ 
     66.. _`cache framework`: ../cache/ 
    6767 
    6868Who's behind this? 
     
    192192We've documented our philosophies on the `design philosophies page`_. 
    193193 
    194 .. _design philosophies page: http://www.djangoproject.com/documentation/design_philosophies/ 
     194.. _design philosophies page: ../design_philosophies/ 
    195195 
    196196Do you have any of those nifty "screencast" things? 
     
    278278 
    279279.. _`Download the code`: http://www.djangoproject.com/download/ 
    280 .. _`installation guide`: http://www.djangoproject.com/documentation/install/ 
    281 .. _tutorial:  http://www.djangoproject.com/documentation/tutorial1/ 
    282 .. _documentation: http://www.djangoproject.com/documentation
     280.. _`installation guide`: ../install/ 
     281.. _tutorial:  ../tutorial1/ 
     282.. _documentation: ..
    283283.. _ask questions: http://www.djangoproject.com/community/ 
    284284 
     
    338338 
    339339.. _WSGI: http://www.python.org/peps/pep-0333.html 
    340 .. _How to use Django with FastCGI: http://www.djangoproject.com/documentation/fastcgi/ 
     340.. _How to use Django with FastCGI: ../fastcgi/ 
    341341.. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements 
    342342 
     
    465465Yes. See `Integrating with a legacy database`_. 
    466466 
    467 .. _`Integrating with a legacy database`: http://www.djangoproject.com/documentation/legacy_databases/ 
     467.. _`Integrating with a legacy database`: ../legacy_databases/ 
    468468 
    469469If I make changes to a model, how do I update the database? 
     
    512512contain arbitrary SQL, so you can make any sorts of changes you need to make. 
    513513 
    514 .. _SQL initial data file: http://www.djangoproject.com/documentation/model_api/#providing-initial-sql-data 
     514.. _SQL initial data file: ../model_api/#providing-initial-sql-data 
    515515 
    516516Why is Django leaking memory? 
     
    593593documentation. 
    594594 
    595 .. _serving the admin files: http://www.djangoproject.com/documentation/modpython/#serving-the-admin-files 
     595.. _serving the admin files: ../modpython/#serving-the-admin-files 
    596596 
    597597My "list_filter" contains a ManyToManyField, but the filter doesn't display. 
     
    631631`guide to the CSS used in the admin`_ to get you started. 
    632632 
    633 .. _`guide to the CSS used in the admin`: http://www.djangoproject.com/documentation/admin_css/ 
     633.. _`guide to the CSS used in the admin`: ../admin_css/ 
    634634 
    635635How do I create users without having to edit password hashes? 
     
    641641You can also use the Python API. See `creating users`_ for full info. 
    642642 
    643 .. _creating users: http://www.djangoproject.com/documentation/authentication/#creating-users 
     643.. _creating users: ../authentication/#creating-users 
    644644 
    645645Contributing code 
     
    652652It's titled `Contributing to Django`_. 
    653653 
    654 .. _Contributing to Django: http://www.djangoproject.com/documentation/contributing/ 
     654.. _Contributing to Django: ../contributing/ 
    655655 
    656656I submitted a bug fix in the ticket system several weeks ago. Why are you ignoring my patch? 
  • django/branches/newforms-admin/docs/fastcgi.txt

    r3759 r4426  
    1818persistent process. 
    1919 
    20 .. _current preferred setup: http://www.djangoproject.com/documentation/modpython/ 
     20.. _current preferred setup: ../modpython/ 
    2121.. _Apache: http://httpd.apache.org/ 
    2222.. _mod_python: http://www.modpython.org/ 
  • django/branches/newforms-admin/docs/flatpages.txt

    r2813 r4426  
    3030    3. Run the command ``manage.py syncdb``. 
    3131 
    32 .. _INSTALLED_APPS: http://www.djangoproject.com/documentation/settings/#installed-apps 
    33 .. _MIDDLEWARE_CLASSES: http://www.djangoproject.com/documentation/settings/#middleware-classes 
     32.. _INSTALLED_APPS: ../settings/#installed-apps 
     33.. _MIDDLEWARE_CLASSES: ../settings/#middleware-classes 
    3434 
    3535How it works 
     
    6464For more on middleware, read the `middleware docs`_. 
    6565 
    66 .. _SITE_ID: http://www.djangoproject.com/documentation/settings/#site-id 
    67 .. _RequestContext: http://www.djangoproject.com/documentation/templates_python/#subclassing-context-djangocontext 
    68 .. _middleware docs: http://www.djangoproject.com/documentation/middleware/ 
     66.. _SITE_ID: ../settings/#site-id 
     67.. _RequestContext: ../templates_python/#subclassing-context-djangocontext 
     68.. _middleware docs: ../middleware/ 
    6969 
    7070How to add, change and delete flatpages 
     
    8585`Django database API`_. 
    8686 
    87 .. _Django model: http://www.djangoproject.com/documentation/model_api/ 
     87.. _Django model: ../model_api/ 
    8888.. _django/contrib/flatpages/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/flatpages/models.py 
    89 .. _Django database API: http://www.djangoproject.com/documentation/db_api/ 
     89.. _Django database API: ../db_api/ 
    9090 
    9191Flatpage templates 
  • django/branches/newforms-admin/docs/forms.txt

    r4208 r4426  
    1515that document to understand how we're making the switch. 
    1616 
    17 .. _newforms documentation: http://www.djangoproject.com/documentation/newforms/ 
     17.. _newforms documentation: ../newforms/ 
    1818 
    1919Introduction 
     
    666666    document for more details). 
    667667 
    668 .. _`generic views`: http://www.djangoproject.com/documentation/generic_views/ 
    669 .. _`models API`: http://www.djangoproject.com/documentation/model_api/ 
    670 .. _settings: http://www.djangoproject.com/documentation/settings/ 
     668.. _`generic views`: ../generic_views/ 
     669.. _`models API`: ../model_api/ 
     670.. _settings: ../settings/ 
  • django/branches/newforms-admin/docs/generic_views.txt

    r4400 r4426  
    7272lambda that returns the QuerySet. 
    7373 
    74 .. _database API docs: http://www.djangoproject.com/documentation/db_api/ 
     74.. _database API docs: ../db_api/ 
    7575 
    7676"Simple" generic views 
     
    224224      ``latest`` will be a list of the latest 10 objects in ``queryset``. 
    225225 
    226 .. _RequestContext docs: http://www.djangoproject.com/documentation/templates_python/#subclassing-context-djangocontext 
     226.. _RequestContext docs: ../templates_python/#subclassing-context-djangocontext 
    227227 
    228228``django.views.generic.date_based.archive_year`` 
     
    917917      about using ``FormWrapper`` objects in templates. 
    918918 
    919 .. _authentication system: http://www.djangoproject.com/documentation/authentication/ 
    920 .. _manipulator and formfield documentation: http://www.djangoproject.com/documentation/forms/ 
     919.. _authentication system: ../authentication/ 
     920.. _manipulator and formfield documentation: ../forms/ 
    921921 
    922922``django.views.generic.create_update.update_object`` 
  • django/branches/newforms-admin/docs/i18n.txt

    r3608 r4426  
    5454from your ``TEMPLATE_CONTEXT_PROCESSORS`` setting. 
    5555 
    56 .. _documentation for USE_I18N: http://www.djangoproject.com/documentation/settings/#use-i18n 
     56.. _documentation for USE_I18N: ../settings/#use-i18n 
    5757 
    5858How to specify translation strings 
     
    176176            verbose_name_plural = _('mythings') 
    177177 
    178 .. _Django models: http://www.djangoproject.com/documentation/model_api/ 
     178.. _Django models: ../model_api/ 
    179179 
    180180Pluralization 
     
    275275string, so they don't need to be aware of translations. 
    276276 
    277 .. _Django templates: http://www.djangoproject.com/documentation/templates_python/ 
     277.. _Django templates: ../templates_python/ 
    278278 
    279279How to create language files 
     
    395395    the steps to take. 
    396396 
    397     .. _Submitting and maintaining translations: http://www.djangoproject.com/documentation/contributing/ 
     397    .. _Submitting and maintaining translations: ../contributing/ 
    398398 
    399399How Django discovers language preference 
     
    473473      en-us). 
    474474 
    475       .. _LANGUAGES setting: http://www.djangoproject.com/documentation/settings/#languages 
     475      .. _LANGUAGES setting: ../settings/#languages 
    476476 
    477477    * If you define a custom ``LANGUAGES`` setting, as explained in the 
     
    531531in ``request.LANGUAGE_CODE``. 
    532532 
    533 .. _settings file: http://www.djangoproject.com/documentation/settings/ 
    534 .. _middleware documentation: http://www.djangoproject.com/documentation/middleware/ 
    535 .. _session: http://www.djangoproject.com/documentation/sessions/ 
    536 .. _request object: http://www.djangoproject.com/documentation/request_response/#httprequest-objects 
     533.. _settings file: ../settings/ 
     534.. _middleware documentation: ../middleware/ 
     535.. _session: ../sessions/ 
     536.. _request object: ../request_response/#httprequest-objects 
    537537 
    538538The ``set_language`` redirect view 
     
    600600    if you're manually configuring your settings.) 
    601601 
    602 .. _settings documentation: http://www.djangoproject.com/documentation/settings/#using-settings-without-the-django-settings-module-environment-variable 
     602.. _settings documentation: ../settings/#using-settings-without-the-django-settings-module-environment-variable 
    603603 
    604604All message file repositories are structured the same way. They are: 
  • django/branches/newforms-admin/docs/install.txt

    r4293 r4426  
    3939.. _mod_python: http://www.modpython.org/ 
    4040.. _WSGI: http://www.python.org/peps/pep-0333.html 
    41 .. _How to use Django with mod_python: http://www.djangoproject.com/documentation/modpython/ 
     41.. _How to use Django with mod_python: ../modpython/ 
    4242.. _server-arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements 
    4343 
  • django/branches/newforms-admin/docs/legacy_databases.txt

    r4243 r4426  
    1010`official tutorial`_. 
    1111 
    12 .. _official tutorial: http://www.djangoproject.com/documentation/tutorial1/ 
     12.. _official tutorial: ../tutorial1/ 
    1313 
    1414Give Django your database parameters 
     
    2626    * `DATABASE_PORT`_ 
    2727 
    28 .. _settings file: http://www.djangoproject.com/documentation/settings/ 
    29 .. _DATABASE_NAME: http://www.djangoproject.com/documentation/settings/#database-name 
    30 .. _DATABASE_ENGINE: http://www.djangoproject.com/documentation/settings/#database-engine 
    31 .. _DATABASE_USER: http://www.djangoproject.com/documentation/settings/#database-user 
    32 .. _DATABASE_PASSWORD: http://www.djangoproject.com/documentation/settings/#database-password 
    33 .. _DATABASE_HOST: http://www.djangoproject.com/documentation/settings/#database-host 
    34 .. _DATABASE_PORT: http://www.djangoproject.com/documentation/settings/#database-port 
     28.. _settings file: ../settings/ 
     29.. _DATABASE_NAME: ../settings/#database-name 
     30.. _DATABASE_ENGINE: ../settings/#database-engine 
     31.. _DATABASE_USER: ../settings/#database-user 
     32.. _DATABASE_PASSWORD: ../settings/#database-password 
     33.. _DATABASE_HOST: ../settings/#database-host 
     34.. _DATABASE_PORT: ../settings/#database-port 
    3535 
    3636Auto-generate the models 
     
    5353``INSTALLED_APPS`` setting. 
    5454 
    55 .. _django-admin.py documentation: http://www.djangoproject.com/documentation/django_admin/ 
     55.. _django-admin.py documentation: ../django_admin/ 
    5656 
    5757Install the core Django tables 
  • django/branches/newforms-admin/docs/middleware.txt

    r4282 r4426  
    4848the `cache documentation`_. 
    4949 
    50 .. _`cache documentation`: http://www.djangoproject.com/documentation/cache/#the-per-site-cache 
     50.. _`cache documentation`: ../cache/#the-per-site-cache 
    5151 
    5252django.middleware.common.CommonMiddleware 
     
    124124Enables session support. See the `session documentation`_. 
    125125 
    126 .. _`session documentation`: http://www.djangoproject.com/documentation/sessions/ 
     126.. _`session documentation`: ../sessions/ 
    127127 
    128128django.contrib.auth.middleware.AuthenticationMiddleware 
     
    132132every incoming ``HttpRequest`` object. See `Authentication in Web requests`_. 
    133133 
    134 .. _Authentication in Web requests: http://www.djangoproject.com/documentation/authentication/#authentication-in-web-requests 
     134.. _Authentication in Web requests: ../authentication/#authentication-in-web-requests 
    135135 
    136136django.middleware.transaction.TransactionMiddleware 
     
    148148See the `transaction management documentation`_. 
    149149 
    150 .. _`transaction management documentation`: http://www.djangoproject.com/documentation/transactions/ 
     150.. _`transaction management documentation`: ../transactions/ 
    151151 
    152152Writing your own middleware 
  • django/branches/newforms-admin/docs/modpython.txt

    r3939 r4426  
    2121.. _prefork MPM: http://httpd.apache.org/docs/2.2/mod/prefork.html 
    2222.. _worker MPM: http://httpd.apache.org/docs/2.2/mod/worker.html 
    23 .. _How to use Django with FastCGI: http://www.djangoproject.com/documentation/fastcgi/ 
     23.. _How to use Django with FastCGI: ../fastcgi/ 
    2424 
    2525Basic configuration 
  • django/branches/newforms-admin/docs/outputting_csv.txt

    r2809 r4426  
    2525    For more information on the CSV library, see the `CSV library docs`_. 
    2626 
    27     .. _Request and response objects: http://www.djangoproject.com/documentation/request_response/ 
     27    .. _Request and response objects: ../request_response/ 
    2828    .. _CSV library docs: http://www.python.org/doc/current/lib/module-csv.html 
    2929 
     
    116116have single or double quotes in it, you can remove the ``addslashes`` filters. 
    117117 
    118 .. _Django template system: http://www.djangoproject.com/documentation/templates/ 
    119 .. _addslashes template filter: http://www.djangoproject.com/documentation/templates/#addslashes 
     118.. _Django template system: ../templates/ 
     119.. _addslashes template filter: ../templates/#addslashes 
  • django/branches/newforms-admin/docs/outputting_pdf.txt

    r3299 r4426  
    4444    `Request and response objects`_. 
    4545 
    46     .. _Request and response objects: http://www.djangoproject.com/documentation/request_response/ 
     46    .. _Request and response objects: ../request_response/ 
    4747 
    4848Here's a "Hello World" example:: 
  • django/branches/newforms-admin/docs/overview.txt

    r3654 r4426  
    1212to start a project. 
    1313 
    14 .. _documentation: http://www.djangoproject.com/documentation
     14.. _documentation: ..
    1515 
    1616Design your model 
  • django/branches/newforms-admin/docs/redirects.txt

    r4229 r4426  
    1616    3. Run the command ``manage.py syncdb``. 
    1717 
    18 .. _INSTALLED_APPS: http://www.djangoproject.com/documentation/settings/#installed-apps 
    19 .. _MIDDLEWARE_CLASSES: http://www.djangoproject.com/documentation/settings/#middleware-classes 
     18.. _INSTALLED_APPS: ../settings/#installed-apps 
     19.. _MIDDLEWARE_CLASSES: ../settings/#middleware-classes 
    2020 
    2121How it works 
     
    4747For more on middleware, read the `middleware docs`_. 
    4848 
    49 .. _SITE_ID: http://www.djangoproject.com/documentation/settings/#site-id 
    50 .. _middleware docs: http://www.djangoproject.com/documentation/middleware/ 
     49.. _SITE_ID: ../settings/#site-id 
     50.. _middleware docs: ../middleware/ 
    5151 
    5252How to add, change and delete redirects 
     
    6767objects via the `Django database API`_. 
    6868 
    69 .. _Django model: http://www.djangoproject.com/documentation/model_api/ 
     69.. _Django model: ../model_api/ 
    7070.. _django/contrib/redirects/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/redirects/models.py 
    71 .. _Django database API: http://www.djangoproject.com/documentation/db_api/ 
     71.. _Django database API: ../db_api/ 
  • django/branches/newforms-admin/docs/request_response.txt

    r3913 r4426  
    118118    `Authentication in Web requests`_. 
    119119 
    120     .. _Authentication in Web requests: http://www.djangoproject.com/documentation/authentication/#authentication-in-web-requests 
     120    .. _Authentication in Web requests: ../authentication/#authentication-in-web-requests 
    121121 
    122122``session`` 
     
    125125    support activated. See the `session documentation`_ for full details. 
    126126 
    127     .. _`session documentation`: http://www.djangoproject.com/documentation/sessions/ 
     127    .. _`session documentation`: ../sessions/ 
    128128 
    129129``raw_post_data`` 
  • django/branches/newforms-admin/docs/sessions.txt

    r4268 r4426  
    2828from your ``INSTALLED_APPS``. It'll save you a small bit of overhead. 
    2929 
    30 .. _middleware: http://www.djangoproject.com/documentation/middleware/ 
     30.. _middleware: ../middleware/ 
    3131 
    3232Using sessions in views 
     
    291291that is, if any of its dictionary values have been assigned or deleted. 
    292292 
    293 .. _Django settings: http://www.djangoproject.com/documentation/settings/ 
     293.. _Django settings: ../settings/ 
    294294 
    295295Technical details 
  • django/branches/newforms-admin/docs/settings.txt

    r4400 r4426  
    6060    django-admin.py runserver --settings=mysite.settings 
    6161 
    62 .. _django-admin.py: http://www.djangoproject.com/documentation/django_admin/ 
     62.. _django-admin.py: ../django_admin/ 
    6363 
    6464On the server (mod_python) 
     
    7676Read the `Django mod_python documentation`_ for more information. 
    7777 
    78 .. _Django mod_python documentation: http://www.djangoproject.com/documentation/modpython/ 
     78.. _Django mod_python documentation: ../modpython/ 
    7979 
    8080Default settings 
     
    103103For more, see the `diffsettings documentation`_. 
    104104 
    105 .. _diffsettings documentation: http://www.djangoproject.com/documentation/django_admin/#diffsettings 
     105.. _diffsettings documentation: ../django_admin/#diffsettings 
    106106 
    107107Using settings in Python code 
     
    307307See also DATETIME_FORMAT, TIME_FORMAT, YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT. 
    308308 
    309 .. _allowed date format strings: http://www.djangoproject.com/documentation/templates/#now 
     309.. _allowed date format strings: ../templates/#now 
    310310 
    311311DATETIME_FORMAT 
     
    320320See also DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT, YEAR_MONTH_FORMAT and MONTH_DAY_FORMAT. 
    321321 
    322 .. _allowed date format strings: http://www.djangoproject.com/documentation/templates/#now 
     322.. _allowed date format strings: ../templates/#now 
    323323 
    324324DEBUG 
     
    434434contains a Django application, as c