diff options
| author | Tim Graham <timograham@gmail.com> | 2017-01-25 13:59:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 13:59:25 -0500 |
| commit | 1c466994d9729a8902d34e277a3a685bef2a08e1 (patch) | |
| tree | 3a0c5ea4fc352aead66378f1fc2217feb6e1e2c7 /docs | |
| parent | 11856ea44e4dd1ff2358c559c0d04ac848832c23 (diff) | |
Refs #23919 -- Removed misc Python 2/3 references.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/howto-release-django.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/geodjango_setup.bat | 8 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/install/index.txt | 11 |
3 files changed, 5 insertions, 16 deletions
diff --git a/docs/internals/howto-release-django.txt b/docs/internals/howto-release-django.txt index 6a91069abc..8316beea75 100644 --- a/docs/internals/howto-release-django.txt +++ b/docs/internals/howto-release-django.txt @@ -303,7 +303,7 @@ Now you're ready to actually put the release out there. To do this: $ pip install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION.tar.gz $ deactivate $ mktmpenv - $ pip install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION-py2.py3-none-any.whl + $ pip install https://www.djangoproject.com/m/releases/$MAJOR_VERSION/Django-$RELEASE_VERSION-py3-none-any.whl $ deactivate This just tests that the tarballs are available (i.e. redirects are up) and diff --git a/docs/ref/contrib/gis/install/geodjango_setup.bat b/docs/ref/contrib/gis/install/geodjango_setup.bat deleted file mode 100644 index b3e6cc6822..0000000000 --- a/docs/ref/contrib/gis/install/geodjango_setup.bat +++ /dev/null @@ -1,8 +0,0 @@ -set OSGEO4W_ROOT=C:\OSGeo4W -set PYTHON_ROOT=C:\Python27 -set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal -set PROJ_LIB=%OSGEO4W_ROOT%\share\proj -set PATH=%PATH%;%PYTHON_ROOT%;%OSGEO4W_ROOT%\bin -reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /f /d "%PATH%" -reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v GDAL_DATA /t REG_EXPAND_SZ /f /d "%GDAL_DATA%" -reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v PROJ_LIB /t REG_EXPAND_SZ /f /d "%PROJ_LIB%" diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt index 06990943ef..53cee2920a 100644 --- a/docs/ref/contrib/gis/install/index.txt +++ b/docs/ref/contrib/gis/install/index.txt @@ -463,7 +463,7 @@ executable with ``cmd.exe``, will set this up: .. code-block:: bat set OSGEO4W_ROOT=C:\OSGeo4W - set PYTHON_ROOT=C:\Python27 + set PYTHON_ROOT=C:\Python3X set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal set PROJ_LIB=%OSGEO4W_ROOT%\share\proj set PATH=%PATH%;%PYTHON_ROOT%;%OSGEO4W_ROOT%\bin @@ -471,15 +471,12 @@ executable with ``cmd.exe``, will set this up: reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v GDAL_DATA /t REG_EXPAND_SZ /f /d "%GDAL_DATA%" reg ADD "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v PROJ_LIB /t REG_EXPAND_SZ /f /d "%PROJ_LIB%" -For your convenience, these commands are available in the executable batch -script, :download:`geodjango_setup.bat`. - .. note:: Administrator privileges are required to execute these commands. - To do this, right-click on :download:`geodjango_setup.bat` and select - :menuselection:`Run as administrator`. You need to log out and log back in again - for the settings to take effect. + To do this, create a ``bat`` script with the commands, right-click it, and + select :menuselection:`Run as administrator`. You need to log out and log + back in again for the settings to take effect. .. note:: |