Skip to content
This repository
Browse code

Merge branch '1.1' into 1.2

Conflicts:
	docs/changelog.rst
  • Loading branch information...
commit 69fd0e94c722c13bc2cace4087c716e7a8d9af09 2 parents 030a83e + 4298a54
Jeff Forcier bitprophet authored
2  docs/changelog.rst
Source Rendered
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
25 25 Changelog
26 26 =========
27 27
  28 +* :support:`467` (also :issue:`468`, :issue:`469`) Handful of documentation
  29 + clarification tweaks. Thanks to Paul Hoffman for the patches.
28 30 * :release:`1.2.3 <2011-10-23>`
29 31 * :release:`1.1.5 <2011-10-23>`
30 32 * :release:`1.0.5 <2011-10-23>`
2  docs/installation.rst
Source Rendered
@@ -55,7 +55,7 @@ setuptools dependency in the future, or include alternative support for the
55 55 PyCrypto
56 56 --------
57 57
58   -`PyCrypto <http://www.amk.ca/python/code/crypto.html>`_ is a dependency of
  58 +`PyCrypto <https://www.dlitz.net/software/pycrypto/>`_ is a dependency of
59 59 Paramiko which provides the low-level (C-based) encryption algorithms used to
60 60 run SSH. There are a couple gotchas associated with installing PyCrypto: its
61 61 compatibility with Python's package tools, and the fact that it is a C-based
3  docs/usage/env.rst
Source Rendered
@@ -220,7 +220,8 @@ during ``fab`` execution. Typically set via :option:`--exclude-hosts/-x <-x>`.
220 220
221 221 **Default:** ``fabfile.py``
222 222
223   -Filename which ``fab`` searches for when loading fabfiles. Obviously, it
  223 +Filename pattern which ``fab`` searches for when loading fabfiles.
  224 +To indicate a specific file, use the full path to the file. Obviously, it
224 225 doesn't make sense to set this in a fabfile, but it may be specified in a
225 226 ``.fabricrc`` file or on the command line.
226 227
3  docs/usage/fab.rst
Source Rendered
@@ -224,7 +224,8 @@ below.
224 224
225 225 .. cmdoption:: --show=LEVELS
226 226
227   - A comma-separated list of :doc:`output levels <output_controls>` to show by
  227 + A comma-separated list of :doc:`output levels <output_controls>` to
  228 + be added to those that are shown by
228 229 default.
229 230
230 231 .. seealso:: `~fabric.operations.run`, `~fabric.operations.sudo`

0 comments on commit 69fd0e9

Please sign in to comment.
Something went wrong with that request. Please try again.