synchronize README.rst with master

README.rst

@@ -21,8 +21,9 @@ serve a set of packages and eggs to easy_install or pip.
 
 Installation and Usage/Quickstart
 =================================
-pypiserver will work with python 2.5, 2.6 and 2.7. Python 3 support
+pypiserver will work with python 2.5, 2.6, 2.7, 3.2 and 3.3. python
-has been added with version 0.4.0.
+3.0 and 3.1 may also work, but pypiserver is not being tested with
+these versions.
 
 Run the following commands to get your PyPI server up and running::
 
@@ -156,6 +157,44 @@ For easy_install it can be configured with the following setting in
   [easy_install]
   index_url = http://localhost:8080/simple/
 
+
+Uploads via setup.py upload
+===========================
+Uploading packages via `python setup.py upload` is also
+possible. First make sure you have the passlib module installed::
+
+  pip install passlib
+
+Then create a apache htpassword file with::
+
+  htpasswd -sc .htaccess myusername
+
+You'll be prompted for a password. You'll need to restart the server
+with the -P option::
+
+  pypi-server -p 8080 -P /path/to/.htaccess /path/to/private_pypi_folder/
+
+Edit or create a ~/.pypirc file with the following content::
+
+  [distutils]
+  index-servers =
+  pypi
+  internal
+
+  [pypi]
+  username:pypiusername
+  password:pypipasswd
+
+  [internal]
+  repository: http://127.0.0.1:8080
+  username: myusername
+  password: mypasswd
+
+Uploading then works by running::
+
+  python setup.py sdist upload -r internal
+
+
 Managing the package directory
 ==============================
 pypi-server's -U option makes it possible to search for updates of
@@ -381,22 +420,25 @@ PyPI server. If pypiserver doesn't work for you, try one of the
 following alternatives:
 
 chishop (http://pypi.python.org/pypi/chishop)
-  a django based server, which also allows uploads
+  a django based server
+
+localshop (http://pypi.python.org/pypi/localshop/)
+  a django based server
 
 simplepypi (http://pypi.python.org/pypi/simplepypi)
-  a twisted based solution, which allows uploads
+  a twisted based solution
 
 ClueReleaseManager (http://pypi.python.org/pypi/ClueReleaseManager)
-  Werkzeug based solution, allows uploads
+  Werkzeug based solution
 
 haufe.eggserver (http://pypi.python.org/pypi/haufe.eggserver)
-  GROK/Zope based, allows uploads
+  GROK/Zope based
 
 scrambled (http://pypi.python.org/pypi/scrambled)
   doesn't require external dependencies, no uploads.
 
 EggBasket (http://pypi.python.org/pypi/EggBasket)
-  TurboGears based, allows uploads
+  TurboGears based
 
 
 Changelog