summaryrefslogtreecommitdiffhomepage
path: root/sites/docs/api
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-14 17:05:05 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-14 17:05:05 -0800
commit48adf5c646c8a2fe86a6670f54a434533814ab89 (patch)
tree53eaf540c31e462f519f9fd299078371886c56a1 /sites/docs/api
parent6d412b06a16a12169f0f71927fbef11638242700 (diff)
Consolidate rsa/dss keys into one doc module
Diffstat (limited to 'sites/docs/api')
-rw-r--r--sites/docs/api/dsskey.rst4
-rw-r--r--sites/docs/api/keys.rst5
-rw-r--r--sites/docs/api/rsakey.rst4
3 files changed, 5 insertions, 8 deletions
diff --git a/sites/docs/api/dsskey.rst b/sites/docs/api/dsskey.rst
deleted file mode 100644
index c4d8d652..00000000
--- a/sites/docs/api/dsskey.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-paramiko.dsskey module
-======================
-
-.. automodule:: paramiko.dsskey
diff --git a/sites/docs/api/keys.rst b/sites/docs/api/keys.rst
new file mode 100644
index 00000000..ca09a878
--- /dev/null
+++ b/sites/docs/api/keys.rst
@@ -0,0 +1,5 @@
+Key handling
+============
+
+.. automodule:: paramiko.dsskey
+.. automodule:: paramiko.rsakey
diff --git a/sites/docs/api/rsakey.rst b/sites/docs/api/rsakey.rst
deleted file mode 100644
index 77dbd894..00000000
--- a/sites/docs/api/rsakey.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-paramiko.rsakey module
-======================
-
-.. automodule:: paramiko.rsakey