summaryrefslogtreecommitdiff
path: root/README.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-08-21 09:24:33 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-08-21 09:24:33 -0400
commitb9063c6df773207bbb25f45f7387bc4c99939e70 (patch)
tree17768f14eeb38d418a87209f5654a3a65674d223 /README.txt
parent4ecf0567147a3b594d11432ee84a634ee754c9c2 (diff)
downloadpython-setuptools-bitbucket-b9063c6df773207bbb25f45f7387bc4c99939e70.tar.gz
Updated documentation to reflect support for PowerShell 3 on earlier versions of Windows. Fixes #247.
Diffstat (limited to 'README.txt')
-rwxr-xr-xREADME.txt22
1 files changed, 12 insertions, 10 deletions
diff --git a/README.txt b/README.txt
index ad6386e5..9a142bf7 100755
--- a/README.txt
+++ b/README.txt
@@ -23,13 +23,14 @@ latest known stable release.
.. _ez_setup.py: https://bootstrap.pypa.io/ez_setup.py
-Windows 8 (Powershell)
-======================
+Windows (Powershell 3 or later)
+===============================
For best results, uninstall previous versions FIRST (see `Uninstalling`_).
-Using Windows 8 or later, it's possible to install with one simple Powershell
-command. Start up Powershell and paste this command::
+Using Windows 8 (which includes PowerShell 3) or earlier versions of Windows
+with PowerShell 3 installed, it's possible to install with one simple
+Powershell command. Start up Powershell and paste this command::
> (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | python -
@@ -45,8 +46,8 @@ Python 2.7 installed::
> (Invoke-WebRequest https://bootstrap.pypa.io/ez_setup.py).Content | py -3 -
The recommended way to install setuptools on Windows is to download
-`ez_setup.py`_ and run it. The script will download the appropriate .egg
-file and install it for you.
+`ez_setup.py`_ and run it. The script will download the appropriate
+distribution file and install it for you.
Once installation is complete, you will find an ``easy_install`` program in
your Python ``Scripts`` subdirectory. For simple invocation and best results,
@@ -55,11 +56,12 @@ present. If you did a user-local install, the ``Scripts`` subdirectory is
``$env:APPDATA\Python\Scripts``.
-Windows 7 (or graphical install)
-================================
+Windows (simplified)
+====================
-For Windows 7 and earlier, download `ez_setup.py`_ using your favorite web
-browser or other technique and "run" that file.
+For Windows without PowerShell 3 or for installation without a command-line,
+download `ez_setup.py`_ using your preferred web browser or other technique
+and "run" that file.
Unix (wget)