Commits

Larry Gilbert  committed d905e96

Refreshed patches for r456

  • Participants
  • Parent commits f7f6e6d

Comments (0)

Files changed (1)

File readme-eng-edit

-diff -r 097e168467b3 README.txt
---- a/README.txt	Mon Sep 21 11:53:47 2009 +0200
-+++ b/README.txt	Tue Sep 22 11:36:20 2009 -0700
-@@ -22,13 +22,13 @@
+diff -r 7a83538a8dc7 README.txt
+--- a/README.txt	Sun Sep 27 20:45:58 2009 +0200
++++ b/README.txt	Mon Sep 28 13:27:33 2009 -0700
+@@ -49,13 +49,13 @@
  
  The `Distribute` installer modifies your installation by de-activating an
  existing installation of `Setuptools` in a bootstrap process. This process 
  you start the installation of `Distribute`.
  
  -------------------------
-@@ -48,7 +48,7 @@
+@@ -76,7 +76,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::
+-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!
+@@ -113,58 +113,58 @@
  
  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
+-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
+-- 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``. Otherwise, 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 your ``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:
 -- reinstall setuptools using its instruction.
 +- Reinstall Setuptools using its instructions.
  
- Last:
+-Lastly:
++Last:
  
 -- remove the *.OLD.* directory located in your site-packages directory if any,
 -  **once you have checked everything was working correctly again**.
  Install FAQ
  -----------
  
--- **Why Distribute turn my Setuptools installation into an fake one ?**
+-- **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,
 +   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 interacts with virtualenv?**
 +- **How does Distribute interact with virtualenv?**
  
 -  Everytime you create a virtualenv it will install setuptools, so you need to
    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
++  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 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,
+   Some work is being done on zc.buildout side to make its bootstrap
+   work with Distribute. Until then, using Distribute in zc.buildout is a bit