diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2014-09-22 09:21:39 -0400 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-09-22 09:21:39 -0400 |
| commit | 70f669a0a41e104bd0427e8ad9142071aae241ed (patch) | |
| tree | a5c0a22c336514e1db001012a64d15477986b671 /sites/docs | |
| parent | e9306cab7448e641a54789039f5c8bfe988de320 (diff) | |
| parent | ccd643cdbd7ba752727d62051058a4454451414d (diff) | |
| download | python-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar python-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar.gz | |
Merge tag 'upstream/1.15.0'
Upstream version 1.15.0
Diffstat (limited to 'sites/docs')
| -rw-r--r-- | sites/docs/api/agent.rst | 2 | ||||
| -rw-r--r-- | sites/docs/api/kex_gss.rst | 5 | ||||
| -rw-r--r-- | sites/docs/api/ssh_gss.rst | 14 | ||||
| -rw-r--r-- | sites/docs/index.rst | 2 |
4 files changed, 22 insertions, 1 deletions
diff --git a/sites/docs/api/agent.rst b/sites/docs/api/agent.rst index 3b614a8..f01ad97 100644 --- a/sites/docs/api/agent.rst +++ b/sites/docs/api/agent.rst @@ -1,4 +1,4 @@ -SSH Agents +SSH agents ========== .. automodule:: paramiko.agent diff --git a/sites/docs/api/kex_gss.rst b/sites/docs/api/kex_gss.rst new file mode 100644 index 0000000..9fd0922 --- /dev/null +++ b/sites/docs/api/kex_gss.rst @@ -0,0 +1,5 @@ +GSS-API key exchange +==================== + +.. automodule:: paramiko.kex_gss + :member-order: bysource diff --git a/sites/docs/api/ssh_gss.rst b/sites/docs/api/ssh_gss.rst new file mode 100644 index 0000000..7a687e1 --- /dev/null +++ b/sites/docs/api/ssh_gss.rst @@ -0,0 +1,14 @@ +GSS-API authentication +====================== + +.. automodule:: paramiko.ssh_gss + :member-order: bysource + +.. autoclass:: _SSH_GSSAuth + :member-order: bysource + +.. autoclass:: _SSH_GSSAPI + :member-order: bysource + +.. autoclass:: _SSH_SSPI + :member-order: bysource diff --git a/sites/docs/index.rst b/sites/docs/index.rst index f336b39..87265d9 100644 --- a/sites/docs/index.rst +++ b/sites/docs/index.rst @@ -50,6 +50,8 @@ Authentication & keys api/agent api/hostkeys api/keys + api/ssh_gss + api/kex_gss Other primary functions |