diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | docs/howto/deployment/modpython.txt | 2 | ||||
| -rw-r--r-- | docs/howto/deployment/modwsgi.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/formtools/form-wizard.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/conf.py b/docs/conf.py index 078c83a492..bdc1280c0b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,11 +41,11 @@ copyright = 'Django Software Foundation and contributors' # other places throughout the built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. release = version # The next version to be released -django_next_version = '1.1' +django_next_version = '1.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt index 8b9a4d3696..50dadf9854 100644 --- a/docs/howto/deployment/modpython.txt +++ b/docs/howto/deployment/modpython.txt @@ -264,7 +264,7 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or .. _lighttpd: http://www.lighttpd.net/ -.. _Nginx: http://wiki.codemongers.com/Main +.. _Nginx: http://wiki.nginx.org/Main .. _TUX: http://en.wikipedia.org/wiki/TUX_web_server .. _Apache: http://httpd.apache.org/ .. _Cherokee: http://www.cherokee-project.com/ diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt index 8bfbfa74f4..12de53f53d 100644 --- a/docs/howto/deployment/modwsgi.txt +++ b/docs/howto/deployment/modwsgi.txt @@ -98,7 +98,7 @@ file. All other URLs will be served using mod_wsgi:: </Directory> .. _lighttpd: http://www.lighttpd.net/ -.. _Nginx: http://wiki.codemongers.com/Main +.. _Nginx: http://wiki.nginx.org/Main .. _TUX: http://en.wikipedia.org/wiki/TUX_web_server .. _Apache: http://httpd.apache.org/ .. _Cherokee: http://www.cherokee-project.com/ diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt index c81c24242a..98f0dbad42 100644 --- a/docs/ref/contrib/formtools/form-wizard.txt +++ b/docs/ref/contrib/formtools/form-wizard.txt @@ -95,7 +95,7 @@ Creating a ``FormWizard`` class The next step is to create a :class:`~django.contrib.formtools.wizard.FormWizard` class, which should be a subclass of ``django.contrib.formtools.wizard.FormWizard``. -As your :class:`~django.forms.forms.Form` classes, this +As with your :class:`~django.forms.forms.Form` classes, this :class:`~django.contrib.formtools.wizard.FormWizard` class can live anywhere in your codebase, but convention is to put it in :file:`forms.py`. |