diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0a6e48b..68b3566 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -13,8 +13,6 @@ import datetime
 import sys
 import os
 
-from jinja2.utils import Markup
-
 # 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.
@@ -47,10 +45,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-copyright = Markup(u'%s, OpenStack Contributors '
-                   u'- use the <a href="https://opendev.org/'
-                   u'openstack/puppet-openstack-guide">puppet-openstack-guide git repo</a> '
-                   u'to propose changes' % datetime.date.today().year)
+copyright = ('%s, OpenStack Contributors' % datetime.date.today().year)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 4670f44..e79c80f 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -10,4 +10,4 @@ Puppet Openstack Contributor Guide
    community
    talk-to-us
    ci
-   releases
+
diff --git a/doc/source/contributor/meetings.rst b/doc/source/contributor/meetings.rst
index fe21b42..40c5a57 100644
--- a/doc/source/contributor/meetings.rst
+++ b/doc/source/contributor/meetings.rst
@@ -5,9 +5,8 @@ Meetings
 ########
 
 1. `IRC meetings`_
-2. `Next meeting`_
-3. `Previous meetings`_
-4. `Meeting organizers`_
+2. `Previous meetings`_
+3. `Meeting organizers`_
 
 IRC meetings
 ============
@@ -23,519 +22,520 @@ be announced on the OpenStack-dev mailing list.
    * - Meeting Time
      - Local Time
    * - UTC 1500 Tuesdays as needed
+     -
 
 Previous meetings
 =================
 - Meeting #113 | 01 August, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-08-01-15.00.log.html>`_ | `agenda
+  openstack.2017-08-01-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170801>`_
+  20170801>`__
 - Meeting #112 | 11 July, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-07-11-15.01.log.html>`_ | `agenda
+  openstack.2017-07-11-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170711>`_
+  20170711>`__
 - Meeting #111 | 06 June, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-06-06-15.00.log.html>`_ | `agenda
+  openstack.2017-06-06-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170606>`_
+  20170606>`__
 - Meeting #110 | 25 April, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-04-25-15.00.log.html>`_ | `agenda
+  openstack.2017-04-25-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170425>`_
+  20170425>`__
 - Meeting #109 | 04 April, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-04-04-15.01.log.html>`_ | `agenda
+  openstack.2017-04-04-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170404>`_
+  20170404>`__
 - Meeting #108 | 07 March, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-03-07-15.01.log.html>`_ | `agenda
+  openstack.2017-03-07-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170307>`_
+  20170307>`__
 - Meeting #107 | 28 February, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-02-28-15.04.log.html>`_ | `agenda
+  openstack.2017-02-28-15.04.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170214>`_
+  20170214>`__
 - Meeting #106 | 14 February, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-02-14-15.01.log.html>`_ | `agenda
+  openstack.2017-02-14-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170214>`_
+  20170214>`__
 - Meeting #105 | 24 January, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-01-24-15.00.log.html>`_ | `agenda
+  openstack.2017-01-24-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170124>`_
+  20170124>`__
 - Meeting #104 | 17 January, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-01-17-15.00.log.html>`_ | `agenda
+  openstack.2017-01-17-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170117>`_
+  20170117>`__
 - Meeting #103 | 10 January, 2017 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2017/puppet_
-  openstack.2017-01-10-15.01.log.html>`_ | `agenda
+  openstack.2017-01-10-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20170110>`_
+  20170110>`__
 - Meeting #102 | 20 December, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-12-20-15.01.log.html>`_ | `agenda
+  openstack.2016-12-20-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161220>`_
+  20161220>`__
 - Meeting #101 | 13 December, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-12-13-15.00.log.html>`_ | `agenda
+  openstack.2016-12-13-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161213>`_
+  20161213>`__
 - Meeting #100 | 06 December, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-12-06-15.00.log.html>`_ | `agenda
+  openstack.2016-12-06-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161206>`_
+  20161206>`__
 - Meeting #99 | 29 November, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-11-29-15.02.log.html>`_ | `agenda
+  openstack.2016-11-29-15.02.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161129>`_
+  20161129>`__
 - Meeting #98 | 22 November, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-11-22-15.01.log.html>`_ | `agenda
+  openstack.2016-11-22-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161122>`_
+  20161122>`__
 - Meeting #97 | 15 November, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-11-15-15.00.log.html>`_ | `agenda
+  openstack.2016-11-15-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161115>`_
+  20161115>`__
 - Meeting #96 | 08 November, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-11-08-15.00.log.html>`_ | `agenda
+  openstack.2016-11-08-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161108>`_
+  20161108>`__
 - Meeting #95 | 01 November, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-11-01-15.00.log.html>`_ | `agenda
+  openstack.2016-11-01-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161101>`_
+  20161101>`__
 - Meeting #94 | 18 October, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-10-18-15.00.log.html>`_ | `agenda
+  openstack.2016-10-18-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161018>`_
+  20161018>`__
 - Meeting #93 | 11 October, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-10-11-15.02.log.html>`_ | `agenda
+  openstack.2016-10-11-15.02.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161011>`_
+  20161011>`__
 - Meeting #92 | 04 October, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-10-04-15.00.log.html>`_ | `agenda
+  openstack.2016-10-04-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20161004>`_
+  20161004>`__
 - Meeting #91 | 27 September, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-09-27-15.00.log.html>`_ | `agenda
+  openstack.2016-09-27-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160927>`_
+  20160927>`__
 - Meeting #90 | 16 August, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-08-16-15.00.log.html>`_ | `agenda
+  openstack.2016-08-16-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160816>`_
+  20160816>`__
 - Meeting #89 | 09 August, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-08-09-15.00.log.html>`_ | `agenda
+  openstack.2016-08-09-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160809>`_
+  20160809>`__
 - Meeting #88 | 26 July, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-07-26-15.01.log.html>`_ | `agenda
+  openstack.2016-07-26-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160726>`_
+  20160726>`__
 - Meeting #87 | 19 July, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-07-19-15.00.log.html>`_ | `agenda
+  openstack.2016-07-19-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160719>`_
+  20160719>`__
 - Meeting #86 | 12 July, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-07-12-15.00.log.html>`_ | `agenda
+  openstack.2016-07-12-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160712>`_
+  20160712>`__
 - Meeting #85 | 14 June, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-06-14-15.00.log.html>`_ | `agenda
+  openstack.2016-06-14-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160614>`_
+  20160614>`__
 - Meeting #84 | 07 June, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-06-07-15.00.log.html>`_ | `agenda
+  openstack.2016-06-07-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160607>`_
+  20160607>`__
 - Meeting #83 | 31 May, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-05-31-15.00.log.html>`_ | `agenda
+  openstack.2016-05-31-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160531>`_
+  20160531>`__
 - Meeting #82 | 24 May, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-05-24-15.00.log.html>`_ | `agenda
+  openstack.2016-05-24-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160524>`_
+  20160524>`__
 - Meeting #81 | 17 May, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-05-17-15.00.log.html>`_ | `agenda
+  openstack.2016-05-17-15.00.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160517>`_
+  20160517>`__
 - Meeting #80 | 10 May, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-05-10-15.01.log.html>`_ | `agenda
+  openstack.2016-05-10-15.01.log.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160510>`_
+  20160510>`__
 - Meeting #79 | 19 April, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-04-19-15.00.html>`_ | `agenda
+  openstack.2016-04-19-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160419>`_
+  20160419>`__
 - Meeting #78 | 12 April, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-04-12-15.00.html>`_ | `agenda
+  openstack.2016-04-12-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160412>`_
+  20160412>`__
 - Meeting #77 | 5 April, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-04-05-15.00.html>`_ | `agenda
+  openstack.2016-04-05-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160405>`_
+  20160405>`__
 - Meeting #76 | 29 March, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-03-29-15.00.html>`_ | `agenda
+  openstack.2016-03-29-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160329>`_
+  20160329>`__
 - Meeting #75 | 22 March, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-03-22-15.00.html>`_ | `agenda
+  openstack.2016-03-22-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160322>`_
+  20160322>`__
 - Meeting #74 | 15 March, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-03-15-15.01.html>`_ | `agenda
+  openstack.2016-03-15-15.01.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160315>`_
+  20160315>`__
 - Meeting #73 | 8 March, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-03-08-15.00.html>`_ | `agenda
+  openstack.2016-03-08-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160308>`_
+  20160308>`__
 - Meeting #72 | 1 March, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-03-01-15.00.html>`_ | `agenda
+  openstack.2016-03-01-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160301>`_
+  20160301>`__
 - Meeting #71 | 23 February, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-02-23-15.00.html>`_ | `agenda
+  openstack.2016-02-23-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160223>`_
+  20160223>`__
 - Meeting #70 | 16 February, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-02-16-15.00.html>`_ | `agenda
+  openstack.2016-02-16-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160216>`_
+  20160216>`__
 - Meeting #69 | 9 February, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-02-09-15.00.html>`_ | `agenda
+  openstack.2016-02-09-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160209>`_
+  20160209>`__
 - Meeting #68 | 2 February, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-02-02-14.59.html>`_ | `agenda
+  openstack.2016-02-02-14.59.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160201>`_
+  20160201>`__
 - Meeting #67 | 19 January, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-01-19-15.00.html>`_ | `agenda
+  openstack.2016-01-19-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160119>`_
+  20160119>`__
 - Meeting #66 | 12 January, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-01-12-15.00.html>`_ | `agenda
+  openstack.2016-01-12-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160112>`_
+  20160112>`__
 - Meeting #65 | 5 January, 2016 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2016/puppet_
-  openstack.2016-01-05-15.00.html>`_ | `agenda
+  openstack.2016-01-05-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20160105>`_
+  20160105>`__
 - Meeting #64 | 29 December, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-12-29-14.59.html>`_ | `agenda
+  openstack.2015-12-29-14.59.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151229>`_
+  20151229>`__
 - Meeting #63 | 15 December, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-12-15-15.00.html>`_ | `agenda
+  openstack.2015-12-15-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151215>`_
+  20151215>`__
 - Meeting #62 | 8 December, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-12-08-15.00.html>`_ | `agenda
+  openstack.2015-12-08-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151208>`_
+  20151208>`__
 - Meeting #61 | 1 December, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-12-01-15.00.html>`_ | `agenda
+  openstack.2015-12-01-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151201>`_
+  20151201>`__
 - Meeting #60 | 24 November, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-11-24-15.00.html>`_ | `agenda
+  openstack.2015-11-24-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151124>`_
+  20151124>`__
 - Meeting #59 | 17 November, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-11-17-15.00.html>`_ | `agenda
+  openstack.2015-11-17-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151117>`_
+  20151117>`__
 - Meeting #58 | 10 November, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-11-10-15.00.html>`_ | `agenda
+  openstack.2015-11-10-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151110>`_
+  20151110>`__
 - Meeting #57 | 03 November, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-11-03-15.16.html>`_ | `agenda
+  openstack.2015-11-03-15.16.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151103>`_
+  20151103>`__
 - Meeting #56 | 20 October, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-10-20-15.00.html>`_ | `agenda
+  openstack.2015-10-20-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151020>`_
+  20151020>`__
 - Meeting #55 | 13 October, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-10-13-15.00.html>`_ | `agenda
+  openstack.2015-10-13-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151013>`_
+  20151013>`__
 - Meeting #54 | 6 October, 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-10-06-15.00.html>`_ | `agenda
+  openstack.2015-10-06-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20151006>`_
+  20151006>`__
 - Meeting #53 | 29 September 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-09-29-15.00.html>`_ | `agenda
+  openstack.2015-09-29-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150929>`_
+  20150929>`__
 - Meeting #52 | 22 September 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-09-22-15.00.html>`_ | `agenda
+  openstack.2015-09-22-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150922>`_
+  20150922>`__
 - Meeting #51 | 15 September 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-09-15-15.00.html>`_ | `agenda
+  openstack.2015-09-15-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150915>`_
+  20150915>`__
 - Meeting #50 | 08 September 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-09-08-15.00.html>`_ | `agenda
+  openstack.2015-09-08-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150908>`_
+  20150908>`__
 - Meeting #49 | 01 September 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-09-01-15.00.html>`_ | `agenda
+  openstack.2015-09-01-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150901>`_
+  20150901>`__
 - Meeting #48 | 25 August 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-08-25-15.01.html>`_ | `agenda
+  openstack.2015-08-25-15.01.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150825>`_
+  20150825>`__
 - Meeting #47 | 18 August 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-08-18-15.00.html>`_ | `agenda
+  openstack.2015-08-18-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150818>`_
+  20150818>`__
 - Meeting #46 | 11 August 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-08-11-15.00.html>`_ | `agenda
+  openstack.2015-08-11-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150811>`_
+  20150811>`__
 - Meeting #45 | 4 August 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-08-04-15.00.html>`_ | `agenda
+  openstack.2015-08-04-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150804>`_
+  20150804>`__
 - Meeting #44 | 28 July 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-07-28-15.00.html>`_ | `agenda
+  openstack.2015-07-28-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150728>`_
+  20150728>`__
 - Meeting #43 | 21 July 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet/2015/puppet.
-  2015-07-21-14.59.html>`_ | `agenda
+  2015-07-21-14.59.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150721>`_
+  20150721>`__
 - Meeting #42 | 14 July 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-07-14-15.00.html>`_ | `agenda
+  openstack.2015-07-14-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150714>`_
+  20150714>`__
 - Meeting #41 | 7 July 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-07-07-15.00.html>`_ | `agenda
+  openstack.2015-07-07-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150707>`_
+  20150707>`__
 - Meeting #40 | 30 june 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-06-30-15.00.html>`_ | `agenda
+  openstack.2015-06-30-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150630>`_
+  20150630>`__
 - Meeting #39 | 23 june 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-06-23-15.00.html>`_ | `agenda
+  openstack.2015-06-23-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150623>`_
+  20150623>`__
 - Meeting #38 | 16 june 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-06-16-15.00.html>`_ | `agenda
+  openstack.2015-06-16-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150616>`_
+  20150616>`__
 - Meeting #37 | 9 june 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-06-09-15.00.html>`_ | `agenda
+  openstack.2015-06-09-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150609>`_
+  20150609>`__
 - Meeting #36 | 2 june 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-06-02-15.00.html>`_ | `agenda
+  openstack.2015-06-02-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150602>`_
+  20150602>`__
 - Meeting #35 | 12 may 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-05-12-15.00.html>`_ | `agenda
+  openstack.2015-05-12-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150512>`_
+  20150512>`__
 - Meeting #34 | 05 may 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-05-05-15.00.html>`_ | `agenda
+  openstack.2015-05-05-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150505>`_
+  20150505>`__
 - Meeting #33 | 28 april 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-04-28-15.00.html>`_ | `agenda
+  openstack.2015-04-28-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150428>`_
+  20150428>`__
 - Meeting #32 | 21 april 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-04-21-15.00.html>`_ | `agenda
+  openstack.2015-04-21-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150421>`_
+  20150421>`__
 - Meeting #31 | 14 april 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-04-14-15.00.html>`_ | `agenda
+  openstack.2015-04-14-15.00.html>`__ | `agenda
   <https://etherpad.openstack.org/p/puppet-openstack-weekly-meeting-
-  20150414>`_
+  20150414>`__
 - Meeting #30 | 7 april 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-04-07-15.00.html>`_
+  openstack.2015-04-07-15.00.html>`__
 - Meeting #29 | 31 march 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-03-31-15.00.html>`_
+  openstack.2015-03-31-15.00.html>`__
 - Meeting #28 | 24 march 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-03-24-14.59.html>`_
+  openstack.2015-03-24-14.59.html>`__
 - Meeting #27 | 16 march 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-03-16-13.59.html>`_
+  openstack.2015-03-16-13.59.html>`__
 - Meeting #26 | 9 march 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-03-09-13.00.html>`_
+  openstack.2015-03-09-13.00.html>`__
 - Meeting #25 | 2 march 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-03-02-14.01.html>`_
+  openstack.2015-03-02-14.01.html>`__
 - Meeting #24 | 23 february 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-02-23-14.00.html>`_
+  openstack.2015-02-23-14.00.html>`__
 - Meeting #23 | 16 february 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-02-16-14.05.html>`_
+  openstack.2015-02-16-14.05.html>`__
 - Meeting #22 | 09 february 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-02-09-14.02.html>`_
+  openstack.2015-02-09-14.02.html>`__
 - Meeting #21 | 02 february 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-02-02-14.00.html>`_
+  openstack.2015-02-02-14.00.html>`__
 - Meeting #20 | 26 january 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-01-26-14.04.html>`_
+  openstack.2015-01-26-14.04.html>`__
 - Meeting #19 | 19 january 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-01-19-14.00.html>`_
+  openstack.2015-01-19-14.00.html>`__
 - Meeting #18 | 12 january 2015 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2015/puppet_
-  openstack.2015-01-12-14.00.html>`_
+  openstack.2015-01-12-14.00.html>`__
 - Meeting #17 | 22 december 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-12-22-14.05.html>`_
+  openstack.2014-12-22-14.05.html>`__
 - Meeting #16 | 15 december 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-12-15-14.03.html>`_
+  openstack.2014-12-15-14.03.html>`__
 - Meeting #15 | 8 december 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-12-08-14.05.html>`_
+  openstack.2014-12-08-14.05.html>`__
 - Meeting #14 | 1 december 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-12-01-14.00.html>`_
+  openstack.2014-12-01-14.00.html>`__
 - Meeting #13 | 24 november 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-11-24-14.04.html>`_
+  openstack.2014-11-24-14.04.html>`__
 - Meeting #12 | 17 november 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-11-17-14.01.html>`_
+  openstack.2014-11-17-14.01.html>`__
 - Meeting #11 | 10 november 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-11-10-14.00.html>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-11-10>`_
+  openstack.2014-11-10-14.00.html>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-11-10>`__
 - During Kilo summit | 3 november 2014 | `Session
-  <https://wiki.openstack.org/wiki/Puppet-openstack/Kilo>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-paris-agenda>`_
+  <https://wiki.openstack.org/wiki/Puppet-openstack/Kilo>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-paris-agenda>`__
 - Meeting #10 | 27 october 2014 | `log
   <http://eavesdrop.openstack.org/meetings/puppet_openstack/2014/puppet_
-  openstack.2014-10-27-14.04.html>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-agenda-10.27.2014>`_
+  openstack.2014-10-27-14.04.html>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-agenda-10.27.2014>`__
 - Meeting #9 | 20 october 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-10-20>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-20>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-10-20>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-20>`__
 - Meeting #8 | 13 october 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-10-13>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-13>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-10-13>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-13>`__
 - Meeting #7 | 06 october 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-10-06>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-06>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-10-06>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-10-06>`__
 - Meeting #6 | 29 september 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-09-29>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-09-29>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-09-29>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-09-29>`__
 - Meeting #5 | 07 july 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-07-07>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-07-07>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-07-07>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-07-07>`__
 - Meeting #4 | 23 june 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-06-23>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-23>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-06-23>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-23>`__
 - Meeting #3 | 16 june 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-06-16>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-16>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-06-16>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-16>`__
 - Meeting #2 | 09 june 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-06-09>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-09>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-06-09>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-09>`__
 - Meeting #1 | 02 june 2014 | `log
-  <http://irclog.perlgeek.de/puppet-openstack/2014-06-02>`_ | `etherpad
-  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-02>`_
+  <http://irclog.perlgeek.de/puppet-openstack/2014-06-02>`__ | `etherpad
+  <https://etherpad.openstack.org/p/puppet-openstack-2014-06-02>`__
 
 
 Meeting organizers
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 4564bf8..d4c807b 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -1,5 +1,6 @@
+===============================
  Puppet Openstack Install Guide
-================================
+===============================
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/source/install/releases.rst b/doc/source/install/releases.rst
index 557fc9d..896db34 100644
--- a/doc/source/install/releases.rst
+++ b/doc/source/install/releases.rst
@@ -164,6 +164,7 @@ Most Recent Modules releases
 .. _puppet-magnum: https://opendev.org/openstack/puppet-magnum
 .. _puppet-manila: https://opendev.org/openstack/puppet-manila
 .. _puppet-mistral: https://opendev.org/openstack/puppet-mistral
+.. _puppet-monasca: https://opendev.org/openstack/puppet-monasca
 .. _puppet-murano: https://opendev.org/openstack/puppet-murano
 .. _puppet-neutron: https://opendev.org/openstack/puppet-neutron
 .. _puppet-nova: https://opendev.org/openstack/puppet-nova
diff --git a/setup.cfg b/setup.cfg
index f888aea..80a3c3c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,14 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1
diff --git a/tox.ini b/tox.ini
index a1d6f8f..5ec4ae9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,12 @@ ignore_basepython_conflict = True
 basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/doc/requirements.txt
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+commands = sphinx-build -W -b html doc/source doc/build/html