diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
| commit | 8cc9ae059ffa6e484d24149ff7508555bfaed1b6 (patch) | |
| tree | d9c8dde5cfb2537e83ffedad1e3490608c9943b2 /sites/docs | |
| parent | 935c55dd1f596f97bd8c3d76dd8abfe9cffaa8b0 (diff) | |
| parent | a83f0d3038e8d16e7c160293d16c2736645564d6 (diff) | |
Merge branch '1.11' into 1.12
Diffstat (limited to 'sites/docs')
| -rw-r--r-- | sites/docs/conf.py | 4 | ||||
| -rw-r--r-- | sites/docs/index.rst | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py new file mode 100644 index 00000000..0c7ffe55 --- /dev/null +++ b/sites/docs/conf.py @@ -0,0 +1,4 @@ +# Obtain shared config values +import os, sys +sys.path.append(os.path.abspath('..')) +from shared_conf import * diff --git a/sites/docs/index.rst b/sites/docs/index.rst new file mode 100644 index 00000000..08b34320 --- /dev/null +++ b/sites/docs/index.rst @@ -0,0 +1,6 @@ +Welcome to Paramiko's documentation! +==================================== + +This site covers Paramiko's usage & API documentation. For basic info on what +Paramiko is, including its public changelog & how the project is maintained, +please see `the main website <http://paramiko.org>`_. |