Merge branch '1.0'

bigmlcom · Mar 20, 2011 · cc8426b · cc8426b
2 parents 8eab8ea + 41e59bb
commit cc8426b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/docs/changes/0.9.5.rst b/docs/changes/0.9.5.rst
@@ -40,3 +40,5 @@ Documentation updates
 
 * :issue:`228`: Added description of the PyCrypto + pip + Python 2.5 problem to
   the documentation and removed the Python 2.5 check from ``setup.py``.
+* :issue:`291`: Updated the PyPM-related install docs re: recent changes in
+  PyPM and its download URLs. Thanks to Sridhar Ratnakumar for the patch.
diff --git a/docs/changes/1.0.1.rst b/docs/changes/1.0.1.rst
@@ -2,6 +2,10 @@
 Changes in version 1.0.1
 ========================
 
+.. note::
+    This release also includes all applicable changes from the :doc:`0.9.5
+    release </changes/0.9.5>`.
+
 Bugfixes
 ========
 

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -197,17 +197,19 @@ ActivePython and PyPM
 =====================
 
 Windows users who already have ActiveState's `ActivePython
-<http://www.activestate.com/activepython>`_ distribution installed may find
-Fabric is best installed with its package manager, ``pypm``. Below is example
-output from an installation of Fabric 0.9.0 via ``pypm``::
+<http://www.activestate.com/activepython/downloads>`_ distribution installed may
+find Fabric is best installed with its (binary) package manager, `PyPM
+<http://code.activestate.com/pypm/>`_. Below is example output from an
+installation of Fabric 0.9.4 via ``pypm``::
 
     C:\> pypm install fabric
-    Ready to perform these actions:
-    The following packages will be installed:
-    fabric-0.9.0 pycrypto-2.0.1
-    Get: [pypm.activestate.com] fabric 0.9.0-1
-    Get: [pypm.activestate.com] pycrypto 2.0.1-1
-    Installing fabric-0.9.0
-    Fixing script
-    C:\Users\<username>\AppData\Roaming\Python\Scripts\fab-script.py
+    The following packages will be installed into "%APPDATA%\Python" (2.7):
+     paramiko-1.7.6 pycrypto-2.0.1 fabric-0.9.4
+    Get: [pypm-free.activestate.com] fabric 0.9.4
+    Get: [pypm-free.activestate.com] paramiko 1.7.6
+    Get: [pypm-free.activestate.com] pycrypto 2.0.1
+    Installing paramiko-1.7.6
     Installing pycrypto-2.0.1
+    Installing fabric-0.9.4
+    Fixing script %APPDATA%\Python\Scripts\fab-script.py
+    C:\>