diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-27 16:36:28 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-27 16:36:28 -0400 |
commit | 0f62d9ae6604ced1a52117113a0fd3b3821a21ca (patch) | |
tree | 451959e9efeafffa9fd18e9788ed965b81d256f2 | |
parent | 2233949c97eea6c52eab547cd5f8aba7f3be4629 (diff) | |
download | cherrypy-0f62d9ae6604ced1a52117113a0fd3b3821a21ca.tar.gz |
Move docs to docs/
-rw-r--r-- | docs/_static/bgsides.png (renamed from sphinx/source/_static/bgsides.png) | bin | 6498 -> 6498 bytes | |||
-rw-r--r-- | docs/_static/cpdocmain.css (renamed from sphinx/source/_static/cpdocmain.css) | 0 | ||||
-rw-r--r-- | docs/_static/images/cpreturn.gif (renamed from sphinx/source/_static/images/cpreturn.gif) | bin | 6088 -> 6088 bytes | |||
-rw-r--r-- | docs/_static/images/cpyield.gif (renamed from sphinx/source/_static/images/cpyield.gif) | bin | 9112 -> 9112 bytes | |||
-rw-r--r-- | docs/_static/images/sushibelt.JPG (renamed from sphinx/source/_static/images/sushibelt.JPG) | bin | 161186 -> 161186 bytes | |||
-rw-r--r-- | docs/advanced.rst (renamed from sphinx/source/advanced.rst) | 0 | ||||
-rw-r--r-- | docs/basics.rst (renamed from sphinx/source/basics.rst) | 0 | ||||
-rw-r--r-- | docs/conf.py (renamed from sphinx/source/conf.py) | 7 | ||||
-rw-r--r-- | docs/config.rst (renamed from sphinx/source/config.rst) | 0 | ||||
-rw-r--r-- | docs/contribute.rst (renamed from sphinx/source/contribute.rst) | 0 | ||||
-rw-r--r-- | docs/deploy.rst (renamed from sphinx/source/deploy.rst) | 0 | ||||
-rw-r--r-- | docs/extend.rst (renamed from sphinx/source/extend.rst) | 0 | ||||
-rw-r--r-- | docs/glossary.rst (renamed from sphinx/source/glossary.rst) | 0 | ||||
-rw-r--r-- | docs/index.rst (renamed from sphinx/source/index.rst) | 0 | ||||
-rw-r--r-- | docs/install.rst (renamed from sphinx/source/install.rst) | 0 | ||||
-rw-r--r-- | docs/intro.rst (renamed from sphinx/source/intro.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.lib.rst (renamed from sphinx/source/pkg/cherrypy.lib.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.process.rst (renamed from sphinx/source/pkg/cherrypy.process.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.rst (renamed from sphinx/source/pkg/cherrypy.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.scaffold.rst (renamed from sphinx/source/pkg/cherrypy.scaffold.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.test.rst (renamed from sphinx/source/pkg/cherrypy.test.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.tutorial.rst (renamed from sphinx/source/pkg/cherrypy.tutorial.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/cherrypy.wsgiserver.rst (renamed from sphinx/source/pkg/cherrypy.wsgiserver.rst) | 0 | ||||
-rw-r--r-- | docs/pkg/modules.rst (renamed from sphinx/source/pkg/modules.rst) | 0 | ||||
-rw-r--r-- | docs/tutorials.rst (renamed from sphinx/source/tutorials.rst) | 0 |
25 files changed, 3 insertions, 4 deletions
diff --git a/sphinx/source/_static/bgsides.png b/docs/_static/bgsides.png Binary files differindex 27c305fa..27c305fa 100644 --- a/sphinx/source/_static/bgsides.png +++ b/docs/_static/bgsides.png diff --git a/sphinx/source/_static/cpdocmain.css b/docs/_static/cpdocmain.css index 4414d472..4414d472 100644 --- a/sphinx/source/_static/cpdocmain.css +++ b/docs/_static/cpdocmain.css diff --git a/sphinx/source/_static/images/cpreturn.gif b/docs/_static/images/cpreturn.gif Binary files differindex 074ea3cd..074ea3cd 100644 --- a/sphinx/source/_static/images/cpreturn.gif +++ b/docs/_static/images/cpreturn.gif diff --git a/sphinx/source/_static/images/cpyield.gif b/docs/_static/images/cpyield.gif Binary files differindex e07c50aa..e07c50aa 100644 --- a/sphinx/source/_static/images/cpyield.gif +++ b/docs/_static/images/cpyield.gif diff --git a/sphinx/source/_static/images/sushibelt.JPG b/docs/_static/images/sushibelt.JPG Binary files differindex 8f379b73..8f379b73 100644 --- a/sphinx/source/_static/images/sushibelt.JPG +++ b/docs/_static/images/sushibelt.JPG diff --git a/sphinx/source/advanced.rst b/docs/advanced.rst index 44f54edb..44f54edb 100644 --- a/sphinx/source/advanced.rst +++ b/docs/advanced.rst diff --git a/sphinx/source/basics.rst b/docs/basics.rst index 8129fc45..8129fc45 100644 --- a/sphinx/source/basics.rst +++ b/docs/basics.rst diff --git a/sphinx/source/conf.py b/docs/conf.py index 7a81f2e6..2c1ceb63 100644 --- a/sphinx/source/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ try: WITH_RTD_THEME = True except ImportError: WITH_RTD_THEME = False - + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -55,8 +55,7 @@ copyright = u'2014, CherryPy Team' # built documents. # # The short X.Y version. -import sys -sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../')) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../')) import cherrypy version = cherrypy.__version__ # The full version, including alpha/beta/rc tags. @@ -109,7 +108,7 @@ if WITH_RTD_THEME: html_theme = "sphinx_rtd_theme" else: html_theme = 'default' - + # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. diff --git a/sphinx/source/config.rst b/docs/config.rst index a4eb3acc..a4eb3acc 100644 --- a/sphinx/source/config.rst +++ b/docs/config.rst diff --git a/sphinx/source/contribute.rst b/docs/contribute.rst index 94bdf2c0..94bdf2c0 100644 --- a/sphinx/source/contribute.rst +++ b/docs/contribute.rst diff --git a/sphinx/source/deploy.rst b/docs/deploy.rst index b7bab85e..b7bab85e 100644 --- a/sphinx/source/deploy.rst +++ b/docs/deploy.rst diff --git a/sphinx/source/extend.rst b/docs/extend.rst index ef8bf8b5..ef8bf8b5 100644 --- a/sphinx/source/extend.rst +++ b/docs/extend.rst diff --git a/sphinx/source/glossary.rst b/docs/glossary.rst index cfeb0966..cfeb0966 100644 --- a/sphinx/source/glossary.rst +++ b/docs/glossary.rst diff --git a/sphinx/source/index.rst b/docs/index.rst index 0ccc48aa..0ccc48aa 100644 --- a/sphinx/source/index.rst +++ b/docs/index.rst diff --git a/sphinx/source/install.rst b/docs/install.rst index 68dd9692..68dd9692 100644 --- a/sphinx/source/install.rst +++ b/docs/install.rst diff --git a/sphinx/source/intro.rst b/docs/intro.rst index 72af26d3..72af26d3 100644 --- a/sphinx/source/intro.rst +++ b/docs/intro.rst diff --git a/sphinx/source/pkg/cherrypy.lib.rst b/docs/pkg/cherrypy.lib.rst index b43db26a..b43db26a 100644 --- a/sphinx/source/pkg/cherrypy.lib.rst +++ b/docs/pkg/cherrypy.lib.rst diff --git a/sphinx/source/pkg/cherrypy.process.rst b/docs/pkg/cherrypy.process.rst index 86fa5436..86fa5436 100644 --- a/sphinx/source/pkg/cherrypy.process.rst +++ b/docs/pkg/cherrypy.process.rst diff --git a/sphinx/source/pkg/cherrypy.rst b/docs/pkg/cherrypy.rst index e9287331..e9287331 100644 --- a/sphinx/source/pkg/cherrypy.rst +++ b/docs/pkg/cherrypy.rst diff --git a/sphinx/source/pkg/cherrypy.scaffold.rst b/docs/pkg/cherrypy.scaffold.rst index c13adbf0..c13adbf0 100644 --- a/sphinx/source/pkg/cherrypy.scaffold.rst +++ b/docs/pkg/cherrypy.scaffold.rst diff --git a/sphinx/source/pkg/cherrypy.test.rst b/docs/pkg/cherrypy.test.rst index 88f1d68a..88f1d68a 100644 --- a/sphinx/source/pkg/cherrypy.test.rst +++ b/docs/pkg/cherrypy.test.rst diff --git a/sphinx/source/pkg/cherrypy.tutorial.rst b/docs/pkg/cherrypy.tutorial.rst index 3676e0ba..3676e0ba 100644 --- a/sphinx/source/pkg/cherrypy.tutorial.rst +++ b/docs/pkg/cherrypy.tutorial.rst diff --git a/sphinx/source/pkg/cherrypy.wsgiserver.rst b/docs/pkg/cherrypy.wsgiserver.rst index 9e91f631..9e91f631 100644 --- a/sphinx/source/pkg/cherrypy.wsgiserver.rst +++ b/docs/pkg/cherrypy.wsgiserver.rst diff --git a/sphinx/source/pkg/modules.rst b/docs/pkg/modules.rst index fe45a992..fe45a992 100644 --- a/sphinx/source/pkg/modules.rst +++ b/docs/pkg/modules.rst diff --git a/sphinx/source/tutorials.rst b/docs/tutorials.rst index f919b318..f919b318 100644 --- a/sphinx/source/tutorials.rst +++ b/docs/tutorials.rst |