13 files changed, 64 insertions, 102 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 39d27e1..9faa27e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,7 +31,13 @@ django.setup()
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'oslosphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'openstackdocstheme']
+
+# openstackdocstheme options
+repository_name = 'openstack/django_openstack_auth'
+bug_project = 'django-openstack-auth'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -88,7 +94,7 @@ modindex_common_prefix = ['openstack_auth.']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
 
 # 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
@@ -162,78 +168,3 @@ html_theme = 'default'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'DjangoOpenStackAuthdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'DjangoOpenStackAuth.tex', u'Django OpenStack Auth Documentation',
-   u'Gabriel Hurley', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'djangoopenstackauth', u'Django OpenStack Auth Documentation',
-     [u'Gabriel Hurley'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'DjangoOpenStackAuth', u'Django OpenStack Auth Documentation',
-   u'Gabriel Hurley', 'DjangoOpenStackAuth', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index b4404a2..9f93215 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -11,15 +11,8 @@ The current version is designed to work with the Keystone V2 or V3 API.
 .. toctree::
    :maxdepth: 2
 
-   installation
-   ref/user
-   ref/views
-   ref/forms
-   ref/backend
-   ref/utils
-
-Indices and tables
-==================
+   install/index
+   reference/index
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/doc/source/installation.rst b/doc/source/install/index.rst
index 866152f..866152f 100644
--- a/doc/source/installation.rst
+++ b/doc/source/install/index.rst
diff --git a/doc/source/ref/user.rst b/doc/source/ref/user.rst
deleted file mode 100644
index 910657e..0000000
--- a/doc/source/ref/user.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-==================
-The ``User`` Class
-==================
-
-.. automodule:: openstack_auth.user
-   :members:
diff --git a/doc/source/ref/backend.rst b/doc/source/reference/backend.rst
index 181536f..181536f 100644
--- a/doc/source/ref/backend.rst
+++ b/doc/source/reference/backend.rst
diff --git a/doc/source/ref/forms.rst b/doc/source/reference/forms.rst
index 120c213..120c213 100644
--- a/doc/source/ref/forms.rst
+++ b/doc/source/reference/forms.rst
diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst
new file mode 100644
index 0000000..77a8e11
--- /dev/null
+++ b/doc/source/reference/index.rst
@@ -0,0 +1,13 @@
+=====================================
+ Django OpenStack Auth API Reference
+=====================================
+
+.. toctree::
+   :maxdepth: 2
+
+   user
+   views
+   forms
+   backend
+   utils
+
diff --git a/doc/source/reference/user.rst b/doc/source/reference/user.rst
new file mode 100644
index 0000000..f54587c
--- /dev/null
+++ b/doc/source/reference/user.rst
@@ -0,0 +1,6 @@
+==============
+The User Class
+==============
+
+.. automodule:: openstack_auth.user
+   :members:
diff --git a/doc/source/ref/utils.rst b/doc/source/reference/utils.rst
index a89e0a2..a89e0a2 100644
--- a/doc/source/ref/utils.rst
+++ b/doc/source/reference/utils.rst
diff --git a/doc/source/ref/views.rst b/doc/source/reference/views.rst
index e71719e..e71719e 100644
--- a/doc/source/ref/views.rst
+++ b/doc/source/reference/views.rst
diff --git a/openstack_auth/locale/pt_BR/LC_MESSAGES/django.po b/openstack_auth/locale/pt_BR/LC_MESSAGES/django.po
index eb5a024..9729744 100644
--- a/openstack_auth/locale/pt_BR/LC_MESSAGES/django.po
+++ b/openstack_auth/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,20 +7,21 @@
 # Andre Campos Bezerra <andrecbezerra@gmail.com>, 2015
 # Gabriel Wainer, 2015
 # Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
+# Fernando Pimenta <fernando.c.pimenta@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: django_openstack_auth 3.1.1.dev1\n"
+"Project-Id-Version: django_openstack_auth 3.2.1.dev5\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2017-01-25 19:41+0000\n"
+"POT-Creation-Date: 2017-06-28 12:08+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-09 02:54+0000\n"
-"Last-Translator: Marcelo Dieder <marcelodieder@gmail.com>\n"
+"PO-Revision-Date: 2017-06-28 12:37+0000\n"
+"Last-Translator: Fernando Pimenta <fernando.c.pimenta@gmail.com>\n"
 "Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.3\n"
+"X-Generator: Zanata 3.9.6\n"
 "Language-Team: Portuguese (Brazil)\n"
 
 msgid "An error occurred authenticating. Please try again later."
@@ -29,12 +30,18 @@ msgstr "Um erro ocorreu autenticando. Por favor tente novamente mais tarde."
 msgid "Authenticate using"
 msgstr "Autenticar usando"
 
+msgid "Could not find service provider ID on Keystone."
+msgstr "Não consegui encontrar o ID do provedor de serviço no Keystone."
+
 msgid "Domain"
 msgstr "Domínio"
 
 msgid "Invalid credentials."
 msgstr "Credencial Inválida"
 
+msgid "K2K Federation not setup for this session"
+msgstr "K2K Federation não está configurada para esta sessão"
+
 msgid ""
 "No authentication backend could be determined to handle the provided "
 "credentials."
@@ -46,6 +53,11 @@ msgid "Password"
 msgstr "Senha"
 
 #, python-format
+msgid "Please consider changing your password, it will expire in %s minutes"
+msgstr ""
+"Por favor, considere a alteração de sua senha, ela irá expirar em %s minutos"
+
+#, python-format
 msgid "Project switch failed for user \"%(username)s\"."
 msgstr "A troca de projeto falhou para o usuário \"%(username)s\"."
 
@@ -53,6 +65,16 @@ msgid "Region"
 msgstr "Região"
 
 #, python-format
+msgid "Service provider authentication failed. %s"
+msgstr "Autenticação do provedor de serviço falhou. %s"
+
+#, python-format
+msgid "Switch to Keystone Provider \"%(keystone_provider)s\"successful."
+msgstr ""
+"Troca para o Provedor Keystone \"%(keystone_provider)s\" realizada com "
+"sucesso."
+
+#, python-format
 msgid "Switch to project \"%(project_name)s\" successful."
 msgstr "Troca para o projeto \"%(project_name)s\" realizada com sucesso."
 
@@ -62,6 +84,9 @@ msgstr "O token de autenticação emitido pelo serviço de identidade expirou."
 msgid "Unable to establish connection to keystone endpoint."
 msgstr "Não foi possível estabelecer conexão com o endpoint do Keystone."
 
+msgid "Unable to retrieve authorized domains."
+msgstr "Não foi possível recuperar domínios autorizados."
+
 msgid "Unable to retrieve authorized projects."
 msgstr "Não foi possível obter os projetos autorizados."
 
diff --git a/requirements.txt b/requirements.txt
index abb3f8a..0b63fd5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,8 +3,8 @@
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 Django<1.10,>=1.8 # BSD
-oslo.config>=4.0.0 # Apache-2.0
-oslo.policy>=1.17.0 # Apache-2.0
+oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
+oslo.policy>=1.23.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
-keystoneauth1>=2.20.0 # Apache-2.0
+keystoneauth1>=2.21.0 # Apache-2.0
 six>=1.9.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 58047f3..125e760 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,6 @@ Babel!=2.4.0,>=2.3.4 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0 # BSD
 mox3!=0.19.0,>=0.7.0 # Apache-2.0
-sphinx!=1.6.1,>=1.5.1 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.11.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD