diff --git a/doc/Makefile b/doc/Makefile
index b63e30032c3..a71920edbb2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXSOURCE 	= source
+SPHINXSOURCE  = source
 PAPER         =
 BUILDDIR      = build
 
@@ -15,82 +15,82 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(S
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
-.DEFAULT_GOAL 	= html
+.DEFAULT_GOAL   = html
 
 help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html      to make standalone HTML files"
-	@echo "  dirhtml   to make HTML files named index.html in directories"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
-	@echo "  htmlhelp  to make HTML files and a HTML help project"
-	@echo "  qthelp    to make HTML files and a qthelp project"
-	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  changes   to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
-	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+    @echo "Please use \`make <target>' where <target> is one of"
+    @echo "  html      to make standalone HTML files"
+    @echo "  dirhtml   to make HTML files named index.html in directories"
+    @echo "  pickle    to make pickle files"
+    @echo "  json      to make JSON files"
+    @echo "  htmlhelp  to make HTML files and a HTML help project"
+    @echo "  qthelp    to make HTML files and a qthelp project"
+    @echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+    @echo "  changes   to make an overview of all changed/added/deprecated items"
+    @echo "  linkcheck to check all external links for integrity"
+    @echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
-	if [ -f .autogenerated ] ; then \
+    -rm -rf $(BUILDDIR)/*
+    if [ -f .autogenerated ] ; then \
         cat .autogenerated | xargs rm ; \
         rm .autogenerated ; \
     fi
 
 html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+    $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+    @echo
+    @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
 dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+    $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+    @echo
+    @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
 pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
+    $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+    @echo
+    @echo "Build finished; now you can process the pickle files."
 
 json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
+    $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+    @echo
+    @echo "Build finished; now you can process the JSON files."
 
 htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+    $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+    @echo
+    @echo "Build finished; now you can run HTML Help Workshop with the" \
+          ".hhp project file in $(BUILDDIR)/htmlhelp."
 
 qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/nova.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/nova.qhc"
+    $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+    @echo
+    @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+          ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+    @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/nova.qhcp"
+    @echo "To view the help file:"
+    @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/nova.qhc"
 
 latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
+    $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+    @echo
+    @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+    @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+          "run these through (pdf)latex."
 
 changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
+    $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+    @echo
+    @echo "The overview file is in $(BUILDDIR)/changes."
 
 linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
+    $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+    @echo
+    @echo "Link check complete; look for any errors in the above output " \
+          "or in $(BUILDDIR)/linkcheck/output.txt."
 
 doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
+    $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+    @echo "Testing of doctests in the sources finished, look at the " \
+          "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/doc/source/contributor/internals/layer3.rst b/doc/source/contributor/internals/layer3.rst
index 8e0f2092a2e..922d929d299 100644
--- a/doc/source/contributor/internals/layer3.rst
+++ b/doc/source/contributor/internals/layer3.rst
@@ -183,21 +183,21 @@ Neutron Routers are realized in OpenVSwitch
 
 
         vagrant@bionic64:~/devstack$ brctl show
-        bridge name	bridge id		STP enabled	interfaces
-        br-eth1		0000.e2e7fc5ccb4d	no
-        br-ex		0000.82ee46beaf4d	no		phy-br-ex
-                                                                qg-39efb3f9-f0
-                                                                qg-77e0666b-cd
-        br-int		0000.5e46cb509849	no		int-br-ex
-                                                                qr-54c9cd83-43
-                                                                qvo199abeb2-63
-                                                                qvo1abbbb60-b8
-                                                                tap74b45335-cc
-        qbr199abeb2-63		8000.ba06e5f8675c	no		qvb199abeb2-63
-                                                                tap199abeb2-63
-        qbr1abbbb60-b8		8000.46a87ed4fb66	no		qvb1abbbb60-b8
-                                                                tap1abbbb60-b8
-        virbr0		8000.000000000000	yes
+        bridge name         bridge id           STP enabled    interfaces
+        br-eth1             0000.e2e7fc5ccb4d   no
+        br-ex               0000.82ee46beaf4d   no             phy-br-ex
+                                                               qg-41efb3f9-f0
+                                                               qg-77e0666b-cd
+        br-int              0000.5e46cb509849   no             int-br-ex
+                                                               qr-54c9cd83-43
+                                                               qvo199abeb2-63
+                                                               qvo1abbbb60-b8
+                                                               tap74b45335-cc
+        qbr199abeb2-63      8000.ba06e5f8675c   no             qvb199abeb2-63
+                                                               tap199abeb2-63
+        qbr1abbbb60-b8      8000.46a87ed4fb66   no             qvb1abbbb60-b8
+                                                               tap1abbbb60-b8
+        virbr0              8000.000000000000   yes
 
 Finding the router in ip/ipconfig
 ---------------------------------
diff --git a/releasenotes/notes/l3-agent-extensions-b348ff26aec0fe88.yaml b/releasenotes/notes/l3-agent-extensions-b348ff26aec0fe88.yaml
index 9b144ece9fe..4a740ec479e 100644
--- a/releasenotes/notes/l3-agent-extensions-b348ff26aec0fe88.yaml
+++ b/releasenotes/notes/l3-agent-extensions-b348ff26aec0fe88.yaml
@@ -2,8 +2,8 @@
 features:
   - The neutron L3 agent now has the ability to load
     agent extensions, which allows other services to
-    integrate without additional agent changes.  An 
-    API for exposing the l3 agent's router info data 
-    to the extensions is also provided so that 
+    integrate without additional agent changes.  An
+    API for exposing the l3 agent's router info data
+    to the extensions is also provided so that
     extensions can remain consistent with router
     state.
diff --git a/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml b/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml
index 50516cb19e6..042606aec88 100644
--- a/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml
+++ b/releasenotes/notes/ovn-metadata-workers-fa8a2019f34bd572.yaml
@@ -6,4 +6,4 @@ upgrade:
     "MetadataProxyHandler" in a local thread <https://review.opendev.org/c/openstack/neutron/+/861649>`_,
     the OVN metadata proxy handler can be spawned in the same process of
     the OVN metadata agent, in a local thread. That reduces the number of
-    OVN SB database connections to one. 
+    OVN SB database connections to one.