Merge with master. Ref #229.

--HG--
branch : feature/issue-229

1 files changed, 12 insertions, 8 deletions

diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 89c08e23..d6a62de8 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -112,10 +112,16 @@ the distutils.  Here's a minimal setup script using setuptools::
     )
 
 As you can see, it doesn't take much to use setuptools in a project.
-Just by doing the above, this project will be able to produce eggs, upload to
+Run that script in your project folder, alongside the Python packages
+you have developed.
+
+Invoke that script to produce eggs, upload to
 PyPI, and automatically include all packages in the directory where the
 setup.py lives.  See the `Command Reference`_ section below to see what
-commands you can give to this setup script.
+commands you can give to this setup script. For example,
+to produce a source distribution, simply invoke::
+
+    python setup.py sdist
 
 Of course, before you release your project to PyPI, you'll want to add a bit
 more information to your setup script to help people find or learn about your
@@ -1467,7 +1473,7 @@ are included in any source distribution you build.  This is a big improvement
 over having to manually write a ``MANIFEST.in`` file and try to keep it in
 sync with your project.  So, if you are using CVS or Subversion, and your
 source distributions only need to include files that you're tracking in
-revision control, don't create a a ``MANIFEST.in`` file for your project.
+revision control, don't create a ``MANIFEST.in`` file for your project.
 (And, if you already have one, you might consider deleting it the next time
 you would otherwise have to change it.)
 
@@ -2595,8 +2601,8 @@ those methods' docstrings for more details.
 Adding Support for Other Revision Control Systems
 -------------------------------------------------
 
-If you would like to create a plugin for ``setuptools`` to find files in other
-source control systems besides CVS and Subversion, you can do so by adding an
+If you would like to create a plugin for ``setuptools`` to find files in
+source control systems, you can do so by adding an
 entry point to the ``setuptools.file_finders`` group.  The entry point should
 be a function accepting a single directory name, and should yield
 all the filenames within that directory (and any subdirectories thereof) that
@@ -2652,9 +2658,7 @@ Subclassing ``Command``
 -----------------------
 
 Sorry, this section isn't written yet, and neither is a lot of what's below
-this point, except for the change log.  You might want to `subscribe to changes
-in this page <setuptools?action=subscribe>`_ to see when new documentation is
-added or updated.
+this point.
 
 XXX