test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed various links in the docs. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-12-23 12:19:05 +00:00
parent 7c6e265a9f
commit 2a9ae71780
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/releases/1.4-alpha-1.txt
View File

@ -6,19 +6,19 @@ December 22, 2011.
Welcome to Django 1.4 alpha! Welcome to Django 1.4 alpha!
This is the first in a series of preview/development releases leading up to the This is the first in a series of preview/development releases leading up to
eventual release of Django 1.4, scheduled for March 2012. This release is the eventual release of Django 1.4, scheduled for March 2012. This release is
primarily targeted at developers who are interested in trying out new features primarily targeted at developers who are interested in trying out new features
and testing the Django codebase to help identify and resolve bugs prior to the and testing the Django codebase to help identify and resolve bugs prior to the
final 1.4 release. final 1.4 release.
As such, this release is *not* intended for production use, and any such use is As such, this release is *not* intended for production use, and any such use
discouraged. is discouraged.
Django 1.4 alpha includes various `new features`_ and some minor `backwards Django 1.4 alpha includes various `new features`_ and some minor `backwards
incompatible changes`_. There are also some features that have been dropped, incompatible changes`_. There are also some features that have been dropped,
which are detailed in :doc:`our deprecation plan </internals/deprecation>`, and which are detailed in :doc:`our deprecation plan </internals/deprecation>`,
we've `begun the deprecation process for some features`_. and we've `begun the deprecation process for some features`_.
.. _new features: `What's new in Django 1.4`_ .. _new features: `What's new in Django 1.4`_
.. _backwards incompatible changes: `Backwards incompatible changes in 1.4`_ .. _backwards incompatible changes: `Backwards incompatible changes in 1.4`_

10
docs/releases/1.4.txt
View File

@ -8,12 +8,12 @@ up-to-date information for those who are following trunk.
Django 1.4 includes various `new features`_ and some minor `backwards Django 1.4 includes various `new features`_ and some minor `backwards
incompatible changes`_. There are also some features that have been dropped, incompatible changes`_. There are also some features that have been dropped,
which are detailed in :doc:`our deprecation plan </internals/deprecation>`, and which are detailed in :doc:`our deprecation plan </internals/deprecation>`,
we've `begun the deprecation process for some features`_. and we've `begun the deprecation process for some features`_.
.. _new features: `What's new in Django 1.4`_ .. _`new features`: `What's new in Django 1.4`_
.. _backwards incompatible changes: backwards-incompatible-changes-1.4_ .. _`backwards incompatible changes`: `Backwards incompatible changes in 1.4`_
.. _begun the deprecation process for some features: deprecated-features-1.4_ .. _`begun the deprecation process for some features`: `Features deprecated in 1.4`_
Python compatibility Python compatibility
==================== ====================

2
docs/topics/i18n/timezones.txt
View File

@ -87,7 +87,7 @@ this mode, the example above becomes::
Dealing with aware datetime objects isn't always intuitive. For instance, Dealing with aware datetime objects isn't always intuitive. For instance,
the ``tzinfo`` argument of the standard datetime constructor doesn't work the ``tzinfo`` argument of the standard datetime constructor doesn't work
reliably for time zones with DST. Using UTC is generally safe; if you're reliably for time zones with DST. Using UTC is generally safe; if you're
using other time zones, you should review `pytz' documentation <pytz>`_ using other time zones, you should review the `pytz`_ documentation
carefully. carefully.
.. note:: .. note::