summaryrefslogtreecommitdiffhomepage
path: root/sites/docs/api/agent.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-04 11:44:57 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-03-04 11:44:57 -0800
commitfac6cde8743d73bfce200062da1bbf5e05a74742 (patch)
tree7fcc75d1f8ed456660c2d954b268f27e0354974f /sites/docs/api/agent.rst
parent0965eaa65d194244b594f7098eb5192a2bbf8484 (diff)
parent72a73f55fae697fe3b940f378664a7c58214647f (diff)
Merge branch '1.11' into 1.12
Conflicts: paramiko/hostkeys.py
Diffstat (limited to 'sites/docs/api/agent.rst')
-rw-r--r--sites/docs/api/agent.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/sites/docs/api/agent.rst b/sites/docs/api/agent.rst
new file mode 100644
index 00000000..3b614a82
--- /dev/null
+++ b/sites/docs/api/agent.rst
@@ -0,0 +1,6 @@
+SSH Agents
+==========
+
+.. automodule:: paramiko.agent
+ :inherited-members:
+ :no-special-members: