aboutsummaryrefslogtreecommitdiff
path: root/sites/docs
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2014-02-14 21:29:59 -0500
committerJeremy T. Bouse <jbouse@debian.org>2014-02-14 21:29:59 -0500
commit3f4d155d984fd27cedd0a333bf44e4724f33e30a (patch)
treeee06fc2a9ec6c5f144015dcbd67763f539d9aa51 /sites/docs
parentd45f78c1381a1f583306c5b6a89989f478980c2f (diff)
parent3bb46c9cb414ca82afab715d2d0cc00ed71cfb6d (diff)
downloadpython-paramiko-3f4d155d984fd27cedd0a333bf44e4724f33e30a.tar
python-paramiko-3f4d155d984fd27cedd0a333bf44e4724f33e30a.tar.gz
Merge tag 'upstream/1.12.2'
Upstream version 1.12.2
Diffstat (limited to 'sites/docs')
-rw-r--r--sites/docs/conf.py4
-rw-r--r--sites/docs/index.rst6
2 files changed, 10 insertions, 0 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py
new file mode 100644
index 0000000..0c7ffe5
--- /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 0000000..08b3432
--- /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>`_.