Merge "clean up a few doc building warnings"

This commit is contained in:
Jenkins 2016-12-15 16:36:20 +00:00 committed by Gerrit Code Review
commit a3b3078b14
2 changed files with 11 additions and 6 deletions

View File

@ -47,6 +47,13 @@ using `Gerrit`_.
Run tests with ``tox -e py27`` if running with python 2.7. See the
``tox.ini`` file for other test environment options.
Code Documentation
==================
.. toctree::
:maxdepth: 1
api/modules
Indices and tables
==================

View File

@ -307,13 +307,11 @@ class BaseAuthProtocol(object):
perform.
"""
# NOTE(jamielennox): Default to True and remove in Pike.
# NOTE(jamielennox): Default to True and remove in Pike. This is a
# compatibility flag to allow passing **kwargs to fetch_token(). This
# is basically to allow compatibility with keystone's override. We will
# assume all subclasses are ok with this being True in the Pike release.
kwargs_to_fetch_token = False
"""A compatibility flag to allow passing **kwargs to fetch_token().
This is basically to allow compatibility with keystone's override. We will
assume all subclasses are ok with this being True in the Pike release.
"""
def __init__(self,
app,