Ticket #16209: 16209_alt_repos_3.diff

File 16209_alt_repos_3.diff, 2.3 KB (added by bedmondmark, 4 years ago)

Updated the patch to reflect jezdez's comments.

  • AUTHORS

    diff --git a/AUTHORS b/AUTHORS
    a b  
    355355    Christian Metts
    356356    michal@plovarna.cz
    357357    Slawek Mikula <slawek dot mikula at gmail dot com>
     358    Shawn Milochik <shawn@milochik.com>
    358359    mitakummaa@gmail.com
    359360    mmarshall
    360361    Andreas Mock <andreas.mock@web.de>
  • docs/topics/install.txt

    diff --git a/docs/topics/install.txt b/docs/topics/install.txt
    a b  
    236236If you'd like to be able to update your Django code occasionally with the
    237237latest bug fixes and improvements, follow these instructions:
    238238
    239 1. Make sure that you have Subversion_ installed, and that you can run its
    240    commands from a shell. (Enter ``svn help`` at a shell prompt to test
    241    this.)
     2391. Make sure that you have Subversion_, Git_, or Mercurial_ installed, and
     240   that you can run its commands from a shell. (Enter ``svn help``,
     241   ``git help``, or ``hg help`` at a shell prompt to test this.) Note that
     242   the Subversion repository is the canonical source for the official
     243   Git and Mercurial repositories and as such will always be the most up-to-date.
    242244
    2432452. Check out Django's main development branch (the 'trunk') like so:
    244246
    245247   .. code-block:: bash
    246248
     249       # subversion
    247250       svn co http://code.djangoproject.com/svn/django/trunk/ django-trunk
    248251
     252   Official mirrors of the subversion repository can be obtained like so:
     253   
     254   .. code-block:: bash
     255
     256       # git
     257       git clone https://github.com/django/django.git
     258
     259       # mercurial
     260       hg clone https://bitbucket.org/django/django
     261
     262   .. admonition :: Caution
     263
     264        These mirrors should be updated every 5 minutes but aren't guaranteed
     265        to be up-to-date since they are hosted on external services.
     266
    2492673. Next, make sure that the Python interpreter can load Django's code. The most
    250268   convenient way to do this is to `modify Python's search path`_. Add a ``.pth``
    251269   file containing the full path to the ``django-trunk`` directory to your
     
    288306
    289307.. _`download page`: http://www.djangoproject.com/download/
    290308.. _Subversion: http://subversion.tigris.org/
     309.. _Git: http://git-scm.com/
     310.. _Mercurial: http://mercurial.selenic.com/
    291311.. _`modify Python's search path`: http://docs.python.org/install/index.html#modifying-python-s-search-path
Back to Top