diff --git a/README.rst b/README.rst index 745d3bf..2dfa818 100644 --- a/README.rst +++ b/README.rst @@ -27,6 +27,20 @@ please visit: http://multimechanize.com Install / Setup ******************* +Multi-Mechanize can be installed from `PyPI `_ using `pip `_:: + + pip install -U multi-mechanize + +... or download the `source distribution from PyPI `_, unarchive, and run:: + + python setup.py install + +... then use ``multimech-newproject`` and ``multimech-run`` to create and run your performance test projects. + +**************************** + Detailed Install / Setup +**************************** + These instructions are for Debian/Ubuntu Linux. For other platforms, the setup is generally the same, with the exeption of installing system dependencies. diff --git a/docs/changelog.rst b/docs/changelog.rst index 99784ff..943cf07 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,15 +1,19 @@ Changelog ========= -Version 1.2.0, 2012-??-?? +Version 1.2.0, 2012-02-07 ************************* * initial release on PyPI (http://pypi.python.org/pypi/multimechanize) * development moved to GitHub (http://github.com/cgoldberg/multi-mechanize) -* using git for version control (pull requests welcome) +* using Git for version control (pull requests welcome) +* new entry-point scripts (``multimech-run``, ``multimech-newproject``) * new version numbering format * new setup and packaging -* new docs +* new documentation (sphinx generated) +* results re-processing (``-r``|``--results`` command line option) +* specify bind address in rpc-server mode (``-b``|``--bind-addr`` command line option) +* specify project directory location (``-d``|``--directory`` command line option) ----