diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | sites/_shared_static/logo.png (renamed from site/_static/logo.png) | bin | 6401 -> 6401 bytes | |||
| -rw-r--r-- | sites/docs/conf.py | 4 | ||||
| -rw-r--r-- | sites/docs/index.rst | 6 | ||||
| -rw-r--r-- | sites/main/_templates/rss.xml (renamed from site/_templates/rss.xml) | 0 | ||||
| -rw-r--r-- | sites/main/blog.py (renamed from site/blog.py) | 0 | ||||
| -rw-r--r-- | sites/main/blog.rst (renamed from site/blog.rst) | 0 | ||||
| -rw-r--r-- | sites/main/blog/first-post.rst (renamed from site/blog/first-post.rst) | 0 | ||||
| -rw-r--r-- | sites/main/blog/second-post.rst (renamed from site/blog/second-post.rst) | 0 | ||||
| -rw-r--r-- | sites/main/conf.py | 4 | ||||
| -rw-r--r-- | sites/main/contact.rst (renamed from site/contact.rst) | 0 | ||||
| -rw-r--r-- | sites/main/contributing.rst (renamed from site/contributing.rst) | 0 | ||||
| -rw-r--r-- | sites/main/index.rst (renamed from site/index.rst) | 0 | ||||
| -rw-r--r-- | sites/main/installing.rst (renamed from site/installing.rst) | 0 | ||||
| -rw-r--r-- | sites/shared_conf.py (renamed from site/conf.py) | 3 | ||||
| -rw-r--r-- | tasks.py | 18 |
16 files changed, 26 insertions, 10 deletions
@@ -5,4 +5,5 @@ dist/ paramiko.egg-info/ test.log docs/ +!sites/docs _build diff --git a/site/_static/logo.png b/sites/_shared_static/logo.png Binary files differindex bc76697e..bc76697e 100644 --- a/site/_static/logo.png +++ b/sites/_shared_static/logo.png 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>`_. diff --git a/site/_templates/rss.xml b/sites/main/_templates/rss.xml index f6f9cbd1..f6f9cbd1 100644 --- a/site/_templates/rss.xml +++ b/sites/main/_templates/rss.xml diff --git a/site/blog.py b/sites/main/blog.py index 3b129ebf..3b129ebf 100644 --- a/site/blog.py +++ b/sites/main/blog.py diff --git a/site/blog.rst b/sites/main/blog.rst index af9651e4..af9651e4 100644 --- a/site/blog.rst +++ b/sites/main/blog.rst diff --git a/site/blog/first-post.rst b/sites/main/blog/first-post.rst index 7b075073..7b075073 100644 --- a/site/blog/first-post.rst +++ b/sites/main/blog/first-post.rst diff --git a/site/blog/second-post.rst b/sites/main/blog/second-post.rst index c4463f33..c4463f33 100644 --- a/site/blog/second-post.rst +++ b/sites/main/blog/second-post.rst diff --git a/sites/main/conf.py b/sites/main/conf.py new file mode 100644 index 00000000..0c7ffe55 --- /dev/null +++ b/sites/main/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/site/contact.rst b/sites/main/contact.rst index b479f170..b479f170 100644 --- a/site/contact.rst +++ b/sites/main/contact.rst diff --git a/site/contributing.rst b/sites/main/contributing.rst index b121e64b..b121e64b 100644 --- a/site/contributing.rst +++ b/sites/main/contributing.rst diff --git a/site/index.rst b/sites/main/index.rst index 7d203b62..7d203b62 100644 --- a/site/index.rst +++ b/sites/main/index.rst diff --git a/site/installing.rst b/sites/main/installing.rst index 0d4dc1ac..0d4dc1ac 100644 --- a/site/installing.rst +++ b/sites/main/installing.rst diff --git a/site/conf.py b/sites/shared_conf.py index 8c6f3aa4..333db542 100644 --- a/site/conf.py +++ b/sites/shared_conf.py @@ -13,7 +13,8 @@ rss_description = 'Paramiko project news' # Alabaster theme html_theme_path = [alabaster.get_path()] -html_static_path = ['_static'] +# Paths relative to invoking conf.py - not this shared file +html_static_path = ['../_shared_static'] html_theme = 'alabaster' html_theme_options = { 'logo': 'logo.png', @@ -6,15 +6,15 @@ from invocations import docs, testing api = Collection.from_module(docs) # TODO: maybe allow rolling configuration into it too heh api.configure({ - 'sphinx.source': 'api', - 'sphinx.target': 'api/_build', + 'sphinx.source': 'sites/docs', + 'sphinx.target': 'sites/docs/_build', }) -api.name = 'api' -site = Collection.from_module(docs) -site.name = 'site' -site.configure({ - 'sphinx.source': 'site', - 'sphinx.target': 'site/_build', +api.name = 'docs' +main = Collection.from_module(docs) +main.name = 'main' +main.configure({ + 'sphinx.source': 'sites/main', + 'sphinx.target': 'sites/main/_build', }) -ns = Collection(testing.test, api=api, site=site) +ns = Collection(testing.test, docs=api, main=main) |
