Ticket #16209: 16209_alt_repos_2.diff

File 16209_alt_repos_2.diff, 2.2 KB (added by ShawnMilo, 4 years ago)

Updated patch addressing aaugustin's comments.

  • AUTHORS

    diff --git AUTHORS AUTHORS
    index 8cb71c1..7284711 100644
    answer newbie questions, and generally made Django that much better: 
    354354    Christian Metts
    355355    michal@plovarna.cz
    356356    Slawek Mikula <slawek dot mikula at gmail dot com>
     357    Shawn Milochik <shawn@milochik.com>
    357358    mitakummaa@gmail.com
    358359    mmarshall
    359360    Andreas Mock <andreas.mock@web.de>
  • docs/topics/install.txt

    diff --git docs/topics/install.txt docs/topics/install.txt
    index 46d6615..731962b 100644
    Installing the development version 
    234234If you'd like to be able to update your Django code occasionally with the
    235235latest bug fixes and improvements, follow these instructions:
    236236
    237 1. Make sure that you have Subversion_ installed, and that you can run its
    238    commands from a shell. (Enter ``svn help`` at a shell prompt to test
    239    this.)
     2371. Make sure that you have Subversion_, Git_, or Mercurial_ installed, and
     238   that you can run its commands from a shell. (Enter ``svn help``,
     239   ``git help``, or ``hg help`` at a shell prompt to test this.) Note that
     240   the Subversion repository is the canonical source for the official
     241   Git and Mercurial repositories and as such will always be the most up-to-date.
    240242
    2412432. Check out Django's main development branch (the 'trunk') like so:
    242244
    243245   .. code-block:: bash
    244246
     247       # subversion
    245248       svn co http://code.djangoproject.com/svn/django/trunk/ django-trunk
    246249
     250       # git
     251       git clone https://github.com/django/django.git
     252
     253       # mercurial
     254       hg clone https://bitbucket.org/django/django
     255
    2472563. Next, make sure that the Python interpreter can load Django's code. The most
    248257   convenient way to do this is to `modify Python's search path`_. Add a ``.pth``
    249258   file containing the full path to the ``django-trunk`` directory to your
    this, Subversion will automatically download any changes. 
    286295
    287296.. _`download page`: http://www.djangoproject.com/download/
    288297.. _Subversion: http://subversion.tigris.org/
     298.. _Git: http://git-scm.com/
     299.. _Mercurial: http://mercurial.selenic.com/
    289300.. _`modify Python's search path`: http://docs.python.org/install/index.html#modifying-python-s-search-path
Back to Top