diff --git a/doc/source/_ga/layout.html b/doc/source/_ga/layout.html
deleted file mode 100644
index 3d0ab0e896..0000000000
--- a/doc/source/_ga/layout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "!layout.html" %}
-
-{% block footer %}
-{{ super() }}
-
-
-{% endblock %}
-
diff --git a/doc/source/_static/basic.css b/doc/source/_static/basic.css
deleted file mode 100644
index d909ce37c7..0000000000
--- a/doc/source/_static/basic.css
+++ /dev/null
@@ -1,416 +0,0 @@
-/**
- * Sphinx stylesheet -- basic theme
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.clearer {
- clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
- width: 100%;
- font-size: 90%;
-}
-
-div.related h3 {
- display: none;
-}
-
-div.related ul {
- margin: 0;
- padding: 0 0 0 10px;
- list-style: none;
-}
-
-div.related li {
- display: inline;
-}
-
-div.related li.right {
- float: right;
- margin-right: 5px;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
- padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
- float: left;
- width: 230px;
- margin-left: -100%;
- font-size: 90%;
-}
-
-div.sphinxsidebar ul {
- list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
- margin-left: 20px;
- list-style: square;
-}
-
-div.sphinxsidebar ul ul {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
- margin-top: 10px;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #98dbcc;
- font-family: sans-serif;
- font-size: 1em;
-}
-
-img {
- border: 0;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
- margin: 10px 0 0 20px;
- padding: 0;
-}
-
-ul.search li {
- padding: 5px 0 5px 20px;
- background-image: url(file.png);
- background-repeat: no-repeat;
- background-position: 0 7px;
-}
-
-ul.search li a {
- font-weight: bold;
-}
-
-ul.search li div.context {
- color: #888;
- margin: 2px 0 0 30px;
- text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
- font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
- width: 90%;
-}
-
-table.contentstable p.biglink {
- line-height: 150%;
-}
-
-a.biglink {
- font-size: 1.3em;
-}
-
-span.linkdescr {
- font-style: italic;
- padding-top: 5px;
- font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable td {
- text-align: left;
- vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
- height: 10px;
-}
-
-table.indextable tr.cap {
- margin-top: 10px;
- background-color: #f2f2f2;
-}
-
-img.toggler {
- margin-right: 3px;
- margin-top: 3px;
- cursor: pointer;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-a.headerlink {
- visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink {
- visibility: visible;
-}
-
-div.body p.caption {
- text-align: inherit;
-}
-
-div.body td {
- text-align: left;
-}
-
-.field-list ul {
- padding-left: 1em;
-}
-
-.first {
-}
-
-p.rubric {
- margin-top: 30px;
- font-weight: bold;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
- margin: 0 0 0.5em 1em;
- border: 1px solid #ddb;
- padding: 7px 7px 0 7px;
- background-color: #ffe;
- width: 40%;
- float: right;
-}
-
-p.sidebar-title {
- font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
- border: 1px solid #ccc;
- padding: 7px 7px 0 7px;
- margin: 10px 0 10px 0;
-}
-
-p.topic-title {
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
- margin-top: 10px;
- margin-bottom: 10px;
- padding: 7px;
-}
-
-div.admonition dt {
- font-weight: bold;
-}
-
-div.admonition dl {
- margin-bottom: 0;
-}
-
-p.admonition-title {
- margin: 0px 10px 5px 0px;
- font-weight: bold;
-}
-
-div.body p.centered {
- text-align: center;
- margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
- border: 0;
- border-collapse: collapse;
-}
-
-table.docutils td, table.docutils th {
- padding: 1px 8px 1px 0;
- border-top: 0;
- border-left: 0;
- border-right: 0;
- border-bottom: 1px solid #aaa;
-}
-
-table.field-list td, table.field-list th {
- border: 0 !important;
-}
-
-table.footnote td, table.footnote th {
- border: 0 !important;
-}
-
-th {
- text-align: left;
- padding-right: 5px;
-}
-
-/* -- other body styles ----------------------------------------------------- */
-
-dl {
- margin-bottom: 15px;
-}
-
-dd p {
- margin-top: 0px;
-}
-
-dd ul, dd table {
- margin-bottom: 10px;
-}
-
-dd {
- margin-top: 3px;
- margin-bottom: 10px;
- margin-left: 30px;
-}
-
-dt:target, .highlight {
- background-color: #fbe54e;
-}
-
-dl.glossary dt {
- font-weight: bold;
- font-size: 1.1em;
-}
-
-.field-list ul {
- margin: 0;
- padding-left: 1em;
-}
-
-.field-list p {
- margin: 0;
-}
-
-.refcount {
- color: #060;
-}
-
-.optional {
- font-size: 1.3em;
-}
-
-.versionmodified {
- font-style: italic;
-}
-
-.system-message {
- background-color: #fda;
- padding: 5px;
- border: 3px solid red;
-}
-
-.footnote:target {
- background-color: #ffa
-}
-
-.line-block {
- display: block;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-.line-block .line-block {
- margin-top: 0;
- margin-bottom: 0;
- margin-left: 1.5em;
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
- overflow: auto;
-}
-
-td.linenos pre {
- padding: 5px 0px;
- border: 0;
- background-color: transparent;
- color: #aaa;
-}
-
-table.highlighttable {
- margin-left: 0.5em;
-}
-
-table.highlighttable td {
- padding: 0 0.5em 0 0.5em;
-}
-
-tt.descname {
- background-color: transparent;
- font-weight: bold;
- font-size: 1.2em;
-}
-
-tt.descclassname {
- background-color: transparent;
-}
-
-tt.xref, a tt {
- background-color: transparent;
- font-weight: bold;
-}
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
- background-color: transparent;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
- vertical-align: middle;
-}
-
-div.body div.math p {
- text-align: center;
-}
-
-span.eqno {
- float: right;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
- div.document,
- div.documentwrapper,
- div.bodywrapper {
- margin: 0 !important;
- width: 100%;
- }
-
- div.sphinxsidebar,
- div.related,
- div.footer,
- #top-link {
- display: none;
- }
-}
diff --git a/doc/source/_static/default.css b/doc/source/_static/default.css
deleted file mode 100644
index c8091ecb4d..0000000000
--- a/doc/source/_static/default.css
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * Sphinx stylesheet -- default theme
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
- font-family: sans-serif;
- font-size: 100%;
- background-color: #11303d;
- color: #000;
- margin: 0;
- padding: 0;
-}
-
-div.document {
- background-color: #1c4e63;
-}
-
-div.documentwrapper {
- float: left;
- width: 100%;
-}
-
-div.bodywrapper {
- margin: 0 0 0 230px;
-}
-
-div.body {
- background-color: #ffffff;
- color: #000000;
- padding: 0 20px 30px 20px;
-}
-
-div.footer {
- color: #ffffff;
- width: 100%;
- padding: 9px 0 9px 0;
- text-align: center;
- font-size: 75%;
-}
-
-div.footer a {
- color: #ffffff;
- text-decoration: underline;
-}
-
-div.related {
- background-color: #133f52;
- line-height: 30px;
- color: #ffffff;
-}
-
-div.related a {
- color: #ffffff;
-}
-
-div.sphinxsidebar {
-}
-
-div.sphinxsidebar h3 {
- font-family: 'Trebuchet MS', sans-serif;
- color: #ffffff;
- font-size: 1.4em;
- font-weight: normal;
- margin: 0;
- padding: 0;
-}
-
-div.sphinxsidebar h3 a {
- color: #ffffff;
-}
-
-div.sphinxsidebar h4 {
- font-family: 'Trebuchet MS', sans-serif;
- color: #ffffff;
- font-size: 1.3em;
- font-weight: normal;
- margin: 5px 0 0 0;
- padding: 0;
-}
-
-div.sphinxsidebar p {
- color: #ffffff;
-}
-
-div.sphinxsidebar p.topless {
- margin: 5px 10px 10px 10px;
-}
-
-div.sphinxsidebar ul {
- margin: 10px;
- padding: 0;
- color: #ffffff;
-}
-
-div.sphinxsidebar a {
- color: #98dbcc;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #98dbcc;
- font-family: sans-serif;
- font-size: 1em;
-}
-
-/* -- body styles ----------------------------------------------------------- */
-
-a {
- color: #355f7c;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-div.body p, div.body dd, div.body li {
- text-align: left;
- line-height: 130%;
-}
-
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
- font-family: 'Trebuchet MS', sans-serif;
- background-color: #f2f2f2;
- font-weight: normal;
- color: #20435c;
- border-bottom: 1px solid #ccc;
- margin: 20px -20px 10px -20px;
- padding: 3px 0 3px 10px;
-}
-
-div.body h1 { margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 160%; }
-div.body h3 { font-size: 140%; }
-div.body h4 { font-size: 120%; }
-div.body h5 { font-size: 110%; }
-div.body h6 { font-size: 100%; }
-
-a.headerlink {
- color: #c60f0f;
- font-size: 0.8em;
- padding: 0 4px 0 4px;
- text-decoration: none;
-}
-
-a.headerlink:hover {
- background-color: #c60f0f;
- color: white;
-}
-
-div.body p, div.body dd, div.body li {
- text-align: left;
- line-height: 130%;
-}
-
-div.admonition p.admonition-title + p {
- display: inline;
-}
-
-div.admonition p {
- margin-bottom: 5px;
-}
-
-div.admonition pre {
- margin-bottom: 5px;
-}
-
-div.admonition ul, div.admonition ol {
- margin-bottom: 5px;
-}
-
-div.note {
- background-color: #eee;
- border: 1px solid #ccc;
-}
-
-div.seealso {
- background-color: #ffc;
- border: 1px solid #ff6;
-}
-
-div.topic {
- background-color: #eee;
-}
-
-div.warning {
- background-color: #ffe4e4;
- border: 1px solid #f66;
-}
-
-p.admonition-title {
- display: inline;
-}
-
-p.admonition-title:after {
- content: ":";
-}
-
-pre {
- padding: 5px;
- background-color: #eeffcc;
- color: #333333;
- line-height: 120%;
- border: 1px solid #ac9;
- border-left: none;
- border-right: none;
-}
-
-tt {
- background-color: #ecf0f3;
- padding: 0 1px 0 1px;
- font-size: 0.95em;
-}
-
-.warning tt {
- background: #efc2c2;
-}
-
-.note tt {
- background: #d6d6d6;
-}
diff --git a/doc/source/_static/tweaks.css b/doc/source/_static/tweaks.css
deleted file mode 100644
index 1b6fdaa186..0000000000
--- a/doc/source/_static/tweaks.css
+++ /dev/null
@@ -1,212 +0,0 @@
-ul.todo_list {
- list-style-type: none;
- margin: 0;
- padding: 0;
-}
-
-ul.todo_list li {
- display: block;
- margin: 0;
- padding: 7px 0;
- border-top: 1px solid #eee;
-}
-
-ul.todo_list li p {
- display: inline;
-}
-
-ul.todo_list li p.link {
- font-weight: bold;
-}
-
-ul.todo_list li p.details {
- font-style: italic;
-}
-
-ul.todo_list li {
-}
-
-div.admonition {
- border: 1px solid #8F1000;
-}
-
-div.admonition p.admonition-title {
- background-color: #8F1000;
- border-bottom: 1px solid #8E8E8E;
-}
-
-a {
- color: #CF2F19;
-}
-
-div.related ul li a {
- color: #CF2F19;
-}
-
-div.sphinxsidebar h4 {
- background-color:#8E8E8E;
- border:1px solid #255E6E;
- color:white;
- font-size:1em;
- margin:1em 0 0.5em;
- padding:0.1em 0 0.1em 0.5em;
-}
-
-em {
- font-style: normal;
-}
-
-table.docutils {
- font-size: 11px;
-}
-
-a tt {
- color:#CF2F19;
-}
-
-/* ------------------------------------------
-PURE CSS SPEECH BUBBLES
-by Nicolas Gallagher
-- http://nicolasgallagher.com/pure-css-speech-bubbles/
-
-http://nicolasgallagher.com
-http://twitter.com/necolas
-
-Created: 02 March 2010
-Version: 1.1 (21 October 2010)
-
-Dual licensed under MIT and GNU GPLv2 © Nicolas Gallagher
------------------------------------------- */
-/* THE SPEECH BUBBLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-/* THE SPEECH BUBBLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-.triangle-border {
- position:relative;
- padding:15px;
- margin:1em 0 3em;
- border:5px solid #BC1518;
- color:#333;
- background:#fff;
-
- /* css3 */
- -moz-border-radius:10px;
- -webkit-border-radius:10px;
- border-radius:10px;
-}
-
-/* Variant : for left positioned triangle
------------------------------------------- */
-
-.triangle-border.left {
- margin-left:30px;
-}
-
-/* Variant : for right positioned triangle
------------------------------------------- */
-
-.triangle-border.right {
- margin-right:30px;
-}
-
-/* THE TRIANGLE
-------------------------------------------------------------------------------------------------------------------------------- */
-
-.triangle-border:before {
- content:"";
- display:block; /* reduce the damage in FF3.0 */
- position:absolute;
- bottom:-40px; /* value = - border-top-width - border-bottom-width */
- left:40px; /* controls horizontal position */
- width:0;
- height:0;
- border:20px solid transparent;
- border-top-color:#BC1518;
-}
-
-/* creates the smaller triangle */
-.triangle-border:after {
- content:"";
- display:block; /* reduce the damage in FF3.0 */
- position:absolute;
- bottom:-26px; /* value = - border-top-width - border-bottom-width */
- left:47px; /* value = (:before left) + (:before border-left) - (:after border-left) */
- width:0;
- height:0;
- border:13px solid transparent;
- border-top-color:#fff;
-}
-
-/* Variant : top
------------------------------------------- */
-
-/* creates the larger triangle */
-.triangle-border.top:before {
- top:-40px; /* value = - border-top-width - border-bottom-width */
- right:40px; /* controls horizontal position */
- bottom:auto;
- left:auto;
- border:20px solid transparent;
- border-bottom-color:#BC1518;
-}
-
-/* creates the smaller triangle */
-.triangle-border.top:after {
- top:-26px; /* value = - border-top-width - border-bottom-width */
- right:47px; /* value = (:before right) + (:before border-right) - (:after border-right) */
- bottom:auto;
- left:auto;
- border:13px solid transparent;
- border-bottom-color:#fff;
-}
-
-/* Variant : left
------------------------------------------- */
-
-/* creates the larger triangle */
-.triangle-border.left:before {
- top:10px; /* controls vertical position */
- left:-30px; /* value = - border-left-width - border-right-width */
- bottom:auto;
- border-width:15px 30px 15px 0;
- border-style:solid;
- border-color:transparent #BC1518;
-}
-
-/* creates the smaller triangle */
-.triangle-border.left:after {
- top:16px; /* value = (:before top) + (:before border-top) - (:after border-top) */
- left:-21px; /* value = - border-left-width - border-right-width */
- bottom:auto;
- border-width:9px 21px 9px 0;
- border-style:solid;
- border-color:transparent #fff;
-}
-
-/* Variant : right
------------------------------------------- */
-
-/* creates the larger triangle */
-.triangle-border.right:before {
- top:10px; /* controls vertical position */
- right:-30px; /* value = - border-left-width - border-right-width */
- bottom:auto;
- left:auto;
- border-width:15px 0 15px 30px;
- border-style:solid;
- border-color:transparent #BC1518;
-}
-
-/* creates the smaller triangle */
-.triangle-border.right:after {
- top:16px; /* value = (:before top) + (:before border-top) - (:after border-top) */
- right:-21px; /* value = - border-left-width - border-right-width */
- bottom:auto;
- left:auto;
- border-width:9px 0 9px 21px;
- border-style:solid;
- border-color:transparent #fff;
-}
-
diff --git a/doc/source/_theme/layout.html b/doc/source/_theme/layout.html
deleted file mode 100644
index 8e565cf2d9..0000000000
--- a/doc/source/_theme/layout.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "sphinxdoc/layout.html" %}
-{% set css_files = css_files + ['_static/tweaks.css'] %}
-
-{%- macro sidebar() %}
-{%- if not embedded %}{% if not theme_nosidebar|tobool %}
-
- {%- endif %}{% endif %}
-{%- endmacro %}
diff --git a/doc/source/_theme/theme.conf b/doc/source/_theme/theme.conf
deleted file mode 100644
index e039fe01f9..0000000000
--- a/doc/source/_theme/theme.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[theme]
-inherit = sphinxdoc
-stylesheet = sphinxdoc.css
-pygments_style = friendly
-
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9b1b86ce06..cca53c2d3e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,18 +29,18 @@ sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'),
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath',
- 'sphinx.ext.ifconfig']
+ 'sphinx.ext.ifconfig', 'oslosphinx']
todo_include_todos = True
# Add any paths that contain templates here, relative to this directory.
# Changing the path so that the Hudson build output contains GA code and the
# source docs do not contain the code so local, offline sphinx builds are
# "clean."
-templates_path = []
-if os.getenv('HUDSON_PUBLISH_DOCS'):
- templates_path = ['_ga', '_templates']
-else:
- templates_path = ['_templates']
+#templates_path = []
+#if os.getenv('HUDSON_PUBLISH_DOCS'):
+# templates_path = ['_ga', '_templates']
+#else:
+# templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -109,8 +109,8 @@ modindex_common_prefix = ['swift.']
# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
# html_theme = 'default'
-html_theme_path = ["."]
-html_theme = '_theme'
+#html_theme_path = ["."]
+#html_theme = '_theme'
# 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
@@ -139,7 +139,7 @@ html_theme = '_theme'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/test-requirements.txt b/test-requirements.txt
index a8381622a8..a5a7118995 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ nose
nosexcover
openstack.nose_plugin
nosehtmloutput
+oslosphinx
sphinx>=1.1.2,<1.2
mock>=1.0
python-swiftclient
diff --git a/tox.ini b/tox.ini
index 206f63855e..b945077b8b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,6 +51,9 @@ commands = nosetests {posargs:test/functional}
[testenv:venv]
commands = {posargs}
+[testenv:docs]
+commands = python setup.py build_sphinx
+
[flake8]
# it's not a bug that we aren't using all of hacking
# H102 -> apache2 license exists