summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-01-30 14:29:16 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-01-30 14:29:16 -0800
commit397cd4ce991b0d72b7f505401b58085cce7cbb05 (patch)
tree29193ef725af782ca147de9fed127e9fb44009ce
parent9035546e40afcd1322fd0e2e0b6a68a291ed3215 (diff)
parent55722240b5b676277ef26a20b4b03ef81be3b372 (diff)
downloadparamiko-397cd4ce991b0d72b7f505401b58085cce7cbb05.tar.gz
Merge branch '1.10' into 1.11
-rw-r--r--sites/www/contact.rst2
-rw-r--r--sites/www/contributing.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/sites/www/contact.rst b/sites/www/contact.rst
index b479f170..2b6583f5 100644
--- a/sites/www/contact.rst
+++ b/sites/www/contact.rst
@@ -8,4 +8,4 @@ following ways:
* IRC: ``#paramiko`` on Freenode
* Mailing list: ``paramiko@librelist.com`` (see `the LibreList homepage
<http://librelist.com>`_ for usage details).
-* This website's :doc:`blog </blog>`.
+* This website - a blog section is forthcoming.
diff --git a/sites/www/contributing.rst b/sites/www/contributing.rst
index b121e64b..2b752cc5 100644
--- a/sites/www/contributing.rst
+++ b/sites/www/contributing.rst
@@ -6,7 +6,7 @@ How to get the code
===================
Our primary Git repository is on Github at `paramiko/paramiko
-<https://github.com/paramiko/paramiko>`; please follow their instruction for
+<https://github.com/paramiko/paramiko>`_; please follow their instructions for
cloning to your local system. (If you intend to submit patches/pull requests,
we recommend forking first, then cloning your fork. Github has excellent
documentation for all this.)