diff --git a/AUTHORS b/AUTHORS index 4bee17e6e8..94f6044926 100644 --- a/AUTHORS +++ b/AUTHORS @@ -114,6 +114,7 @@ answer newbie questions, and generally made Django that much better: Jeong-Min Lee Christopher Lenz lerouxb@gmail.com + Waylan Limberg limodou mattmcc Martin Maney diff --git a/docs/contributing.txt b/docs/contributing.txt index d802d3eaf6..a0abb8da7c 100644 --- a/docs/contributing.txt +++ b/docs/contributing.txt @@ -484,6 +484,29 @@ Alternatively, you can use a symlink called ``django`` that points to the location of the branch's ``django`` package. If you want to switch back, just change the symlink to point to the old code. +A third option is to use a `path file`_ (``.pth``) which should +work on all systems (including MS Windows, which doesn't have symlinks +available). First, make sure there are no files, directories or symlinks named +``django`` in your ``site-packages`` directory. Then create a text file named +``django.pth`` and save it to your ``site-packages`` directory. That file +should contain a path to your copy of Django on a single line and optional +comments. Here is an example that points to multiple branches. Just uncomment +the line for the branch you want to use ('Trunk' in this example) and make +sure all other lines are commented:: + + # Trunk is a svn checkout of: + # http://code.djangoproject.com/svn/django/trunk/ + # + /path/to/trunk + + # is a svn checkout of: + # http://code.djangoproject.com/svn/django/branches// + # + #/path/to/ + + # On windows a path may look like this: + # C:/path/to/ + If you're using Django 0.95 or earlier and installed it using ``python setup.py install``, you'll have a directory called something like ``Django-0.95-py2.4.egg`` instead of ``django``. In this case, edit the file @@ -491,6 +514,8 @@ If you're using Django 0.95 or earlier and installed it using file. Then copy the branch's version of the ``django`` directory into ``site-packages``. +.. _path file: http://docs.python.org/lib/module-site.html + Official releases =================