diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-21 16:59:21 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-21 16:59:21 -0800 |
commit | 2da914252064af8dc419b49a423ab57fdb0617c4 (patch) | |
tree | 27fdd3d93db3ccf8af80c03893a858d20c20fdf8 | |
parent | c224fdecf174077f3b7a15f056e65b10282fed38 (diff) | |
download | paramiko-2da914252064af8dc419b49a423ab57fdb0617c4.tar.gz |
Rename 'main' doctree to 'www'; refactor sphinx task conf
-rw-r--r-- | sites/www/_templates/rss.xml (renamed from sites/main/_templates/rss.xml) | 0 | ||||
-rw-r--r-- | sites/www/blog.py (renamed from sites/main/blog.py) | 0 | ||||
-rw-r--r-- | sites/www/blog.rst (renamed from sites/main/blog.rst) | 0 | ||||
-rw-r--r-- | sites/www/blog/first-post.rst (renamed from sites/main/blog/first-post.rst) | 0 | ||||
-rw-r--r-- | sites/www/blog/second-post.rst (renamed from sites/main/blog/second-post.rst) | 0 | ||||
-rw-r--r-- | sites/www/conf.py (renamed from sites/main/conf.py) | 0 | ||||
-rw-r--r-- | sites/www/contact.rst (renamed from sites/main/contact.rst) | 0 | ||||
-rw-r--r-- | sites/www/contributing.rst (renamed from sites/main/contributing.rst) | 0 | ||||
-rw-r--r-- | sites/www/index.rst (renamed from sites/main/index.rst) | 0 | ||||
-rw-r--r-- | sites/www/installing.rst (renamed from sites/main/installing.rst) | 0 | ||||
-rw-r--r-- | tasks.py | 27 |
11 files changed, 17 insertions, 10 deletions
diff --git a/sites/main/_templates/rss.xml b/sites/www/_templates/rss.xml index f6f9cbd1..f6f9cbd1 100644 --- a/sites/main/_templates/rss.xml +++ b/sites/www/_templates/rss.xml diff --git a/sites/main/blog.py b/sites/www/blog.py index 3b129ebf..3b129ebf 100644 --- a/sites/main/blog.py +++ b/sites/www/blog.py diff --git a/sites/main/blog.rst b/sites/www/blog.rst index af9651e4..af9651e4 100644 --- a/sites/main/blog.rst +++ b/sites/www/blog.rst diff --git a/sites/main/blog/first-post.rst b/sites/www/blog/first-post.rst index 7b075073..7b075073 100644 --- a/sites/main/blog/first-post.rst +++ b/sites/www/blog/first-post.rst diff --git a/sites/main/blog/second-post.rst b/sites/www/blog/second-post.rst index c4463f33..c4463f33 100644 --- a/sites/main/blog/second-post.rst +++ b/sites/www/blog/second-post.rst diff --git a/sites/main/conf.py b/sites/www/conf.py index 0c7ffe55..0c7ffe55 100644 --- a/sites/main/conf.py +++ b/sites/www/conf.py diff --git a/sites/main/contact.rst b/sites/www/contact.rst index b479f170..b479f170 100644 --- a/sites/main/contact.rst +++ b/sites/www/contact.rst diff --git a/sites/main/contributing.rst b/sites/www/contributing.rst index b121e64b..b121e64b 100644 --- a/sites/main/contributing.rst +++ b/sites/www/contributing.rst diff --git a/sites/main/index.rst b/sites/www/index.rst index 7d203b62..7d203b62 100644 --- a/sites/main/index.rst +++ b/sites/www/index.rst diff --git a/sites/main/installing.rst b/sites/www/installing.rst index 0d4dc1ac..0d4dc1ac 100644 --- a/sites/main/installing.rst +++ b/sites/www/installing.rst @@ -1,16 +1,23 @@ +from os.path import join + from invoke import Collection -from invocations import docs, testing +from invocations import docs as _docs, testing + +d = 'sites' -# Usage doc/API site -api = Collection.from_module(docs, name='docs', config={ - 'sphinx.source': 'sites/docs', - 'sphinx.target': 'sites/docs/_build', +# Usage doc/API site (published as docs.paramiko.org) +path = join(d, 'docs') +docs = Collection.from_module(_docs, name='docs', config={ + 'sphinx.source': path, + 'sphinx.target': join(path, '_build'), }) -# Main/about/changelog site -main = Collection.from_module(docs, name='main', config={ - 'sphinx.source': 'sites/main', - 'sphinx.target': 'sites/main/_build', + +# Main/about/changelog site ((www.)?paramiko.org) +path = join(d, 'www') +www = Collection.from_module(_docs, name='www', config={ + 'sphinx.source': path, + 'sphinx.target': join(path, '_build'), }) -ns = Collection(testing.test, docs=api, main=main) +ns = Collection(testing.test, docs=docs, www=www) |