Commit 2a9ae717 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed various links in the docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7c6e265a
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -6,19 +6,19 @@ December 22, 2011.

Welcome to Django 1.4 alpha!

This is the first in a series of preview/development releases leading up to the
eventual release of Django 1.4, scheduled for March 2012. This release is
This is the first in a series of preview/development releases leading up to
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
and testing the Django codebase to help identify and resolve bugs prior to the
final 1.4 release.

As such, this release is *not* intended for production use, and any such use is
discouraged.
As such, this release is *not* intended for production use, and any such use
is discouraged.

Django 1.4 alpha includes various `new features`_ and some minor `backwards
incompatible changes`_. There are also some features that have been dropped,
which are detailed in :doc:`our deprecation plan </internals/deprecation>`, and
we've `begun the deprecation process for some features`_.
which are detailed in :doc:`our deprecation plan </internals/deprecation>`,
and we've `begun the deprecation process for some features`_.

.. _new features: `What's new in Django 1.4`_
.. _backwards incompatible changes: `Backwards incompatible changes in 1.4`_
+5 −5
Original line number Diff line number Diff line
@@ -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
incompatible changes`_. There are also some features that have been dropped,
which are detailed in :doc:`our deprecation plan </internals/deprecation>`, and
we've `begun the deprecation process for some features`_.
which are detailed in :doc:`our deprecation plan </internals/deprecation>`,
and we've `begun the deprecation process for some features`_.

.. _new features: `What's new in Django 1.4`_
.. _backwards incompatible changes: backwards-incompatible-changes-1.4_
.. _begun the deprecation process for some features: deprecated-features-1.4_
.. _`new features`: `What's new in Django 1.4`_
.. _`backwards incompatible changes`: `Backwards incompatible changes in 1.4`_
.. _`begun the deprecation process for some features`: `Features deprecated in 1.4`_

Python compatibility
====================
+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ this mode, the example above becomes::
    Dealing with aware datetime objects isn't always intuitive. For instance,
    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
    using other time zones, you should review `pytz' documentation <pytz>`_
    using other time zones, you should review the `pytz`_ documentation
    carefully.

.. note::