Commits

Anonymous committed 2854424

Really a refreshed patch this time (apparently I have much to learn about using mq)

  • Participants
  • Parent commits 48b5100

Comments (0)

Files changed (1)

+diff -r 097e168467b3 README.txt
+--- a/README.txt	Mon Sep 21 11:53:47 2009 +0200
++++ b/README.txt	Tue Sep 22 11:13:58 2009 -0700
+@@ -22,13 +22,13 @@
+ 
+ The `Distribute` installer modifies your installation by de-activating an
+ existing installation of `Setuptools` in a bootstrap process. This process 
+-has been tested in various installation schemes and contexts but in case of a 
++has been tested in various installation schemes and contexts, but in case of a 
+ bug during this process your Python installation might be left in a broken
+ state. Since all modified files and directories are copied before the 
+ installation, you will be able to get back to a normal state by reading
+ the instructions in the `Uninstallation instructions`_ section.
+ 
+-In any case, it is recommended to save you `site-packages` directory before 
++In any case, it is recommended that you save your `site-packages` directory before 
+ you start the installation of `Distribute`.
+ 
+ -------------------------
+@@ -48,7 +48,7 @@
+ Download ``distribute_setup.py`` and execute it, using the Python interpreter of
+ your choice.
+ 
+-If your shell has the `wget` program you can do::
++If your shell has the `wget` program, you can do::
+ 
+     $ wget http://nightly.ziade.org/distribute_setup.py
+     $ python distribute_setup.py
+@@ -64,7 +64,7 @@
+ Source installation
+ ===================
+ 
+-Download the source tarball, and uncompress it, then run the install command::
++Download the source tarball, uncompress it, then run the install command::
+ 
+     $ wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.2.tar.gz
+     $ tar -xzvf distribute-0.6.2.tar.gz
+@@ -76,68 +76,68 @@
+ ---------------------------
+ 
+ Like other distutils-based distributions, Distribute doesn't provide an 
+-uninstaller yet. It's all manual !
++uninstaller yet. It's all manual!
+ 
+ Distribute is installed in three steps:
+ 
+-1- it gets out of the way an existing installation of Setuptools
+-2- it installs a `fake` setuptools installation 
+-3- it installs distribute
++1- It moves an existing installation of Setuptools out of the way
++2- It installs a `fake` Setuptools installation 
++3- It installs Distribute
+ 
+ Distribute can be removed like this:
+ 
+-- run `easy_install -m Distribute`. This will remove the Distribute reference
++- Run `easy_install -m Distribute`. This will remove the Distribute reference
+   from `easy-install.pth` *or* edit the file and remove it yourself.
+-- remove the distribute*.egg file located in your site-packages directory
+-- remove the setuptools.pth file located in you site-packages directory
+-- remove the easy_install script located in you sys.prefix/bin directory
+-- remove the setuptools*.egg directory located in your site-packages directory
++- Remove the distribute*.egg file located in your site-packages directory
++- Remove the setuptools.pth file located in you site-packages directory
++- Remove the easy_install script located in you sys.prefix/bin directory
++- Remove the setuptools*.egg directory located in your site-packages directory
+   if any.
+ 
+-If you want to get back to setuptools:
++If you want to get back to Setuptools:
+ 
+-- reinstall setuptools using its instruction.
++- Reinstall setuptools using its instructions.
+ 
+ Last:
+ 
+-- remove the *.OLD.* directory located in your site-packages directory if any,
+-  **once you have checked everything was working correctly again**.
++- Remove the *.OLD.* directory located in your site-packages directory if any,
++  **once you have checked that everything is working correctly again**.
+ 
+ -----------
+ Install FAQ
+ -----------
+ 
+-- **Why Distribute turn my Setuptools installation into an fake one ?**
++- **Why did Distribute turn my Setuptools installation into a fake one?**
+ 
+    Since Distribute is a fork, and since it provides the same package and modules,
+    it fakes that the Setuptools installation is still present, so all the programs
+-   that where using Setuptools still work.
++   that were using Setuptools still work.
+ 
+-   If it wasn't doing it, a program that would try to install Setuptools 
+-   would overwrite in turn Distribute.
++   If it didn't do that, a program that tried to install Setuptools would in
++   turn overwrite Distribute.
+ 
+-- **How does Distribute interacts with virtualenv ?**
++- **How does Distribute interact with virtualenv?**
+ 
+-  Everytime you create a virtualenv it will install setuptools, so you need to
++  Every time you create a virtualenv it will install Setuptools, so you need to
+   re-install Distribute in it right after. The Distribute project will not
+   attempt to patch virtualenv so it uses it when globally installed.
+ 
+   Once installed, your virtualenv will use Distribute transparently.
+ 
+-  Although, if you have Setuptools installed in your system-wide Python,
++  However, if you have Setuptools installed in your system-wide Python,
+   and if the virtualenv you are in was generated without the `--no-site-packages`
+   option, the Distribute installation will stop.
+ 
+-  You need in this case to build a virtualenv with the --no-site-packages option
++  In this case, you need to build a virtualenv with the `--no-site-packages` option
+   or to install `Distribute` globally.
+ 
+-- **How does Distribute interacts with zc.buildout ?**
++- **How does Distribute interact with zc.buildout?**
+ 
+   Like virtualenv, Distribute has to be installed after setuptools. The simplest
+   way is to add it in a `zc.recipe.egg` section so the job is done when you 
+   build your buildout.
+ 
+-  If you are combining zc.buildout and virtualenv, you might fail in the 
++  If you are combining zc.buildout and virtualenv, you might fail due to the 
+   problem described in the previous FAQ entry.
+ 
+   Last, you will need to use the provided special `bootstrap.py` file,