Merge branch '1.15'

beckjake · Sep 19, 2014 · 8fb1361 · 8fb1361
2 parents 9cfb9d2 + 0e4a803
commit 8fb1361
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/sites/docs/api/keys.rst b/sites/docs/api/keys.rst
@@ -1,6 +1,23 @@
+============
 Key handling
 ============
 
+Parent key class
+================
+
 .. automodule:: paramiko.pkey
+
+DSA (DSS)
+=========
+
 .. automodule:: paramiko.dsskey
+
+RSA
+===
+
 .. automodule:: paramiko.rsakey
+
+ECDSA
+=====
+
+.. automodule:: paramiko.ecdsakey