merge from ianb

docs/index.txt

@@ -44,9 +44,8 @@ pip is meant to improve on easy_install.  Some of the improvements:
 * Maybe uninstallation will get added. (It might get added to easy_install,
   but I think the chance for pip is higher.)
 
-Also, pip will eventually be merged directly with pip, making it
-simple to define fixed sets of requirements and reliably reproduce a set of
-packages.
+* Simple to define fixed sets of requirements and reliably reproduce a
+  set of packages.
 
 pip is complementary with `virtualenv
 <http://pypi.python.org/pypi/virtualenv>`_, and it is encouraged that you use

docs/news.txt

@@ -7,11 +7,11 @@ tip
 * Added ability to override the default log file name (``pip-log.txt``)
   with the environmental variable ``$PIP_LOG_FILE``.
 
-* Made the freeze command to return the installed packages instead of
+* Made the freeze command print installed packages to stdout instead of
   writing them to a file. Use simple redirection (e.g.
   ``pip freeze > stable-req.txt``) to get a file with requirements.
 
-* Fixed problem of freezing an editable packages from a Git repository.
+* Fixed problem with freezing editable packages from a Git repository.
 
 * Added support for base URLs using ``<base href='...'>`` when parsing
   HTML pages.

tests/test_freeze.txt

@@ -101,23 +101,23 @@ Now what about Mercurial::
 
     >>> reset_env()
     >>> env = get_env()
-    >>> result = env.run('hg', 'clone', '-r', 'a5748745272a', 'http://bitbucket.org/mitsuhiko/pygments-main/', 'pygments')
+    >>> result = env.run('hg', 'clone', '-r', 'f8f7eaf275c5', 'http://bitbucket.org/jezdez/django-dbtemplates/', 'django-dbtemplates')
     >>> result = env.run(os.path.join(env.base_path, 'bin/python'), 'setup.py', 'develop',
-    ...                  cwd=os.path.join(env.base_path, 'pygments'))
+    ...                  cwd=os.path.join(env.base_path, 'django-dbtemplates'))
     >>> result = run_pip('freeze', expect_stderr=True)
     >>> print result
     Script result: ...ython... ../../pip.py -E .../test-scratch freeze
     -- stdout: --------------------
-    -e hg+http://bitbucket.org/mitsuhiko/pygments-main/@...#egg=Pygments-...
+    -e hg+http://bitbucket.org/jezdez/django-dbtemplates/@...#egg=django_dbtemplates-...
     ...
     <BLANKLINE>
 
-    >>> result = run_pip('freeze', '-f', 'hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments', expect_stderr=True)
+    >>> result = run_pip('freeze', '-f', 'hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates', expect_stderr=True)
     >>> print result
-    Script result: ...ython... ../../pip.py -E .../test-scratch freeze -f hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments
+    Script result: ...ython... ../../pip.py -E .../test-scratch freeze -f hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates
     -- stdout: --------------------
-    -f hg+http://bitbucket.org/mitsuhiko/pygments-main#egg=Pygments
-    -e hg+http://bitbucket.org/mitsuhiko/pygments-main/@...#egg=Pygments-...
+    -f hg+http://bitbucket.org/jezdez/django-dbtemplates#egg=django_dbtemplates
+    -e hg+http://bitbucket.org/jezdez/django-dbtemplates/@...#egg=django_dbtemplates-...
     ...
     <BLANKLINE>