Ticket #6739: 6739.diff

File 6739.diff, 5.1 KB (added by SmileyChris, 5 years ago)
  • docs/intro/install.txt

    diff --git a/docs/intro/install.txt b/docs/intro/install.txt
    index edac4cf..0b4cf87 100644
    a b Being a Python Web framework, Django requires Python. It works with any Python 
    1313version from 2.4 to 2.7 (due to backwards
    1414incompatibilities in Python 3.0, Django does not currently work with
    1515Python 3.0; see :doc:`the Django FAQ </faq/install>` for more
    16 information on supported Python versions and the 3.0 transition), but we recommend installing Python 2.5 or later. If you do so, you won't need to set up a database just yet: Python 2.5 or later includes a lightweight database called SQLite_.
     16information on supported Python versions and the 3.0 transition), but we
     17recommend installing Python 2.5 or later. If you do so, you won't need to set
     18up a database just yet: Python 2.5 or later includes a lightweight database
     19called SQLite_.
    1720
    1821.. _sqlite: http://sqlite.org/
    1922
    probably already have it installed. 
    2730
    2831.. _jython: http://www.jython.org/
    2932
    30 You can verify that Python's installed by typing ``python`` from your shell; you should see something like::
     33You can verify that Python is installed by typing ``python`` from your shell;
     34you should see something like::
    3135
    3236    Python 2.5.1 (r251:54863, Jan 17 2008, 19:35:17)
    3337    [GCC 4.0.1 (Apple Inc. build 5465)] on darwin
    You've got three easy options to install Django: 
    7478    documentation marked **new in development version**. That phrase flags
    7579    features that are only available in development versions of Django, and
    7680    they likely won't work with an official release.
    77    
     81
     82
     83Verifying
     84---------
     85
     86To verify that Django can be seen by Python, type ``python`` from your shell.
     87Then at the Python prompt, try to import Django::
     88
     89    >>> import django
     90    >>> print django.get_version()
     91    1.3
     92
     93
    7894That's it!
    7995----------
    8096
  • docs/topics/install.txt

    diff --git a/docs/topics/install.txt b/docs/topics/install.txt
    index 1804f1c..791ba51 100644
    a b If you installed Django from a Python egg, remove the Django ``.egg`` file, 
    161161and remove the reference to the egg in the file named ``easy-install.pth``.
    162162This file should also be located in your ``site-packages`` directory.
    163163
     164.. _finding-site-packages:
     165
    164166.. admonition:: Where are my ``site-packages`` stored?
    165167
    166168    The location of the ``site-packages`` directory depends on the operating
    latest bug fixes and improvements, follow these instructions: 
    250252
    251253       svn co http://code.djangoproject.com/svn/django/trunk/ django-trunk
    252254
    253 3. Next, make sure that the Python interpreter can load Django's code. There
    254    are various ways of accomplishing this.  One of the most convenient, on
    255    Linux, Mac OSX or other Unix-like systems, is to use a symbolic link:
     2553. Next, make sure that the Python interpreter can load Django's code. The most
     256   convenient way to do this is to
     257   `modify Python's search path <modify-python-path>`_. Add a ``.pth``
     258   file containing the full path to the ``django-trunk`` directory to your
     259   system's ``site-packages`` directory. For example, on a Unix-like system:
    256260
    257261   .. code-block:: bash
    258262
    259        ln -s WORKING-DIR/django-trunk/django SITE-PACKAGES-DIR/django
     263       echo WORKING-DIR/django-trunk > SITE-PACKAGES-DIR/django.pth
    260264
    261265   (In the above line, change ``SITE-PACKAGES-DIR`` to match the location of
    262266   your system's ``site-packages`` directory, as explained in the
    263    "Where are my ``site-packages`` stored?" section above. Change WORKING-DIR
    264    to match the full path to your new ``django-trunk`` directory.)
    265 
    266    Alternatively, you can define your ``PYTHONPATH`` environment variable
    267    so that it includes the ``django-trunk`` directory. This is perhaps the
    268    most convenient solution on Windows systems, which don't support symbolic
    269    links. (Environment variables can be defined on Windows systems `from the
    270    Control Panel`_.)
    271 
    272    .. admonition:: What about Apache and mod_wsgi?
    273 
    274       If you take the approach of setting ``PYTHONPATH``, you'll need
    275       to remember to do the same thing in your WSGI application once
    276       you deploy your production site. Do this by appending to
    277       ``sys.path`` in your WSGI application.
    278 
    279       More information about deployment is available, of course, in our
    280       :doc:`How to use Django with mod_wsgi </howto/deployment/modwsgi>`
    281       documentation.
     267   :ref:`Where are my site-packages stored? <finding-site-packages>` section
     268   above. Change ``WORKING-DIR/django-trunk`` to match the full path to your
     269   new ``django-trunk`` directory.)
    282270
    2832714. On Unix-like systems, create a symbolic link to the file
    284272   ``django-trunk/django/bin/django-admin.py`` in a directory on your system
    this, Subversion will automatically download any changes. 
    307295
    308296.. _`download page`: http://www.djangoproject.com/download/
    309297.. _Subversion: http://subversion.tigris.org/
    310 .. _from the Control Panel: http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/sysdm_advancd_environmnt_addchange_variable.mspx
     298.. _modify-python-path: http://docs.python.org/install/index.html#modifying-python-s-search-path
Back to Top