Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '1.1' into 1.2

Conflicts:
	docs/changelog.rst
  • Loading branch information...
commit 69fd0e94c722c13bc2cace4087c716e7a8d9af09 2 parents 030a83e + 4298a54
@bitprophet bitprophet authored
View
2  docs/changelog.rst
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :support:`467` (also :issue:`468`, :issue:`469`) Handful of documentation
+ clarification tweaks. Thanks to Paul Hoffman for the patches.
* :release:`1.2.3 <2011-10-23>`
* :release:`1.1.5 <2011-10-23>`
* :release:`1.0.5 <2011-10-23>`
View
2  docs/installation.rst
@@ -55,7 +55,7 @@ setuptools dependency in the future, or include alternative support for the
PyCrypto
--------
-`PyCrypto <http://www.amk.ca/python/code/crypto.html>`_ is a dependency of
+`PyCrypto <https://www.dlitz.net/software/pycrypto/>`_ is a dependency of
Paramiko which provides the low-level (C-based) encryption algorithms used to
run SSH. There are a couple gotchas associated with installing PyCrypto: its
compatibility with Python's package tools, and the fact that it is a C-based
View
3  docs/usage/env.rst
@@ -220,7 +220,8 @@ during ``fab`` execution. Typically set via :option:`--exclude-hosts/-x <-x>`.
**Default:** ``fabfile.py``
-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.
View
3  docs/usage/fab.rst
@@ -224,7 +224,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
default.
.. seealso:: `~fabric.operations.run`, `~fabric.operations.sudo`
Please sign in to comment.
Something went wrong with that request. Please try again.