Browse files

Merge branch '1.2' into 1.3

  • Loading branch information...
2 parents c912734 + 69fd0e9 commit 579398001fcecacd7541d634ce75b2e789f0c052 @bitprophet bitprophet committed Nov 4, 2011
Showing with 7 additions and 3 deletions.
  1. +2 −0 docs/changelog.rst
  2. +1 −1 docs/installation.rst
  3. +2 −1 docs/usage/env.rst
  4. +2 −1 docs/usage/fab.rst
2 docs/changelog.rst
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
+* :support:`467` (also :issue:`468`, :issue:`469`) Handful of documentation
+ clarification tweaks. Thanks to Paul Hoffman for the patches.
* :release:`1.3.1 <2011-10-24>`
* :bug:`457` Ensured that Fabric fast-fails parallel tasks if any child
processes encountered errors. Previously, multi-task invocations would
2 docs/installation.rst
@@ -59,7 +59,7 @@ setuptools dependency in the future, or include alternative support for the
-`PyCrypto <>`_ provides the low-level
+`PyCrypto <>`_ provides the low-level
(C-based) encryption algorithms used to run SSH, and is thus required by our
SSH library. There are a couple gotchas associated with installing PyCrypto:
its compatibility with Python's package tools, and the fact that it is a
3 docs/usage/env.rst
@@ -220,7 +220,8 @@ during ``fab`` execution. Typically set via :option:`--exclude-hosts/-x <-x>`.
**Default:** ````
-Filename which ``fab`` searches for when loading fabfiles. Obviously, it
+Filename pattern which ``fab`` searches for when loading fabfiles.
+To indicate a specific file, use the full path to the file. Obviously, it
doesn't make sense to set this in a fabfile, but it may be specified in a
``.fabricrc`` file or on the command line.
3 docs/usage/fab.rst
@@ -238,7 +238,8 @@ below.
.. cmdoption:: --show=LEVELS
- A comma-separated list of :doc:`output levels <output_controls>` to show by
+ A comma-separated list of :doc:`output levels <output_controls>` to
+ be added to those that are shown by
.. seealso:: ``, `~fabric.operations.sudo`

0 comments on commit 5793980

Please sign in to comment.