diff --git a/api-ref/source/v2/firewall_log.inc b/api-ref/source/v2/firewall_log.inc
index be02bbc80..c1dbd4d94 100644
--- a/api-ref/source/v2/firewall_log.inc
+++ b/api-ref/source/v2/firewall_log.inc
@@ -23,7 +23,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 401,403
+Error response codes: 401, 403
 
 Request
 -------
@@ -62,7 +62,7 @@ Creates a firewall log.
 
 Normal response codes: 200
 
-Error response codes: 400,401,403
+Error response codes: 400, 401, 403
 
 Request
 -------
@@ -118,7 +118,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -158,7 +158,7 @@ Updates a firewall log.
 
 Normal response codes: 200
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -206,7 +206,7 @@ Deletes a firewall log.
 
 Normal response codes: 202
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
diff --git a/api-ref/source/v2/flavors.inc b/api-ref/source/v2/flavors.inc
index 2da2730ff..9a00a1931 100644
--- a/api-ref/source/v2/flavors.inc
+++ b/api-ref/source/v2/flavors.inc
@@ -101,7 +101,7 @@ and submit the request again.
 
 Normal response codes: 201
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -147,7 +147,7 @@ response code.
 
 Normal response codes: 200
 
-Error response codes: 404,403,401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -187,7 +187,7 @@ service profiles and consumers depending on the value.
 
 Normal response codes: 200
 
-Error response codes: 404,403,401,400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -234,7 +234,7 @@ Deletes a flavor.
 
 Normal response codes: 204
 
-Error response codes: 404,403,401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -261,7 +261,7 @@ Will return ``409 Conflict`` if association already exists.
 
 Normal response codes: 201
 
-Error response codes: 404,403,401,400,409
+Error response codes: 400, 401, 403, 404, 409
 
 Request
 -------
@@ -296,7 +296,7 @@ Disassociate a flavor from a service profile.
 
 Normal response codes: 204
 
-Error response codes: 404,403,401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -376,7 +376,7 @@ and submit the request again.
 
 Normal response codes: 201
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -427,7 +427,7 @@ response code.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -463,7 +463,7 @@ Updates a service profile.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -516,7 +516,7 @@ Either metadata or a driver is required.
 
 Normal response codes: 204
 
-Error response codes: 409,404,403,401
+Error response codes: 401, 403, 404, 409
 
 Request
 -------
diff --git a/api-ref/source/v2/lbaas-v2.inc b/api-ref/source/v2/lbaas-v2.inc
index 801ea6361..28245b832 100644
--- a/api-ref/source/v2/lbaas-v2.inc
+++ b/api-ref/source/v2/lbaas-v2.inc
@@ -230,7 +230,7 @@ belong to your project, the service returns the HTTP
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -374,7 +374,7 @@ statuses for its children.
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -658,7 +658,7 @@ status.
 
 Normal response codes: 202
 
-Error response codes: 422, 401, 404
+Error response codes: 401, 404, 422
 
 Request
 -------
@@ -985,7 +985,7 @@ attached does not have an ``ACTIVE`` provisioning status.
 
 Normal response codes: 202
 
-Error response codes: 422, 401, 404
+Error response codes: 401, 404, 422
 
 Request
 -------
@@ -1224,7 +1224,7 @@ Example: Show pool member details
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -1532,7 +1532,7 @@ Example: Show health monitor details
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
diff --git a/api-ref/source/v2/logging_resource.inc b/api-ref/source/v2/logging_resource.inc
index a74556d11..7a7230247 100644
--- a/api-ref/source/v2/logging_resource.inc
+++ b/api-ref/source/v2/logging_resource.inc
@@ -23,7 +23,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 401,403
+Error response codes: 401, 403
 
 Request
 -------
@@ -61,7 +61,7 @@ Creates a logging resource.
 
 Normal response codes: 200
 
-Error response codes: 400,401,403
+Error response codes: 400, 401, 403
 
 Request
 -------
@@ -116,7 +116,7 @@ and-column-selection>`__.
 
 Normal response codes: 200
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -155,7 +155,7 @@ Updates a logging resource.
 
 Normal response codes: 200
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -203,7 +203,7 @@ Deletes a logging resource.
 
 Normal response codes: 202
 
-Error response codes: 400,401,403,404
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
diff --git a/api-ref/source/v2/networks.inc b/api-ref/source/v2/networks.inc
index fbe2d69fe..8e12026b5 100644
--- a/api-ref/source/v2/networks.inc
+++ b/api-ref/source/v2/networks.inc
@@ -64,7 +64,7 @@ and-column-selection>`__.
 
 Normal response codes: 200
 
-Error response codes: 404, 401
+Error response codes: 401, 404
 
 Request
 -------
@@ -130,7 +130,7 @@ Updates a network.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -199,7 +199,7 @@ Deletes a network and its associated resources.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -306,7 +306,7 @@ the request body.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -406,7 +406,7 @@ networks in the request body are created.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
diff --git a/api-ref/source/v2/qos.inc b/api-ref/source/v2/qos.inc
index d0cc4f1ee..89b24333b 100644
--- a/api-ref/source/v2/qos.inc
+++ b/api-ref/source/v2/qos.inc
@@ -19,7 +19,7 @@ Shows details for a bandwidth limit rule for a QoS policy.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -58,7 +58,7 @@ response code.
 
 Normal response codes: 200
 
-Error response codes: 400,401,413,503,500
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -102,7 +102,9 @@ Delete bandwidth limit rule
 
 Deletes a bandwidth limit rule for a QoS policy.
 
-Error response codes: 204,400,401,413,503,500
+Normal response codes: 204
+
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -123,7 +125,7 @@ The list might be empty.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -167,7 +169,9 @@ Users with an administrative role can create policies on behalf of
 other projects by specifying a project ID that is different than
 their own.
 
-Error response codes: 201,404,409,401,413,503,500
+Normal response codes: 201
+
+Error response codes: 401, 404, 409, 413
 
 Request
 -------
@@ -210,7 +214,7 @@ Shows details for a DSCP marking rule for a QoS policy.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -248,7 +252,7 @@ response code.
 
 Normal response codes: 200
 
-Error response codes: 400,401,413,503,500
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -289,7 +293,9 @@ Delete DSCP marking rule
 
 Deletes a DSCP marking rule for a QoS policy.
 
-Error response codes: 204,400,401,413,503,500
+Normal response codes: 204
+
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -310,7 +316,7 @@ The list may be empty.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -342,7 +348,9 @@ Create DSCP marking rule
 
 Creates a DSCP marking rule for a QoS policy.
 
-Error response codes: 201,404,409,401,413,503,500
+Normal response codes: 201
+
+Error response codes: 401, 404, 409, 413
 
 Request
 -------
@@ -378,7 +386,7 @@ Shows details for a QoS policy.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -420,7 +428,7 @@ response code.
 
 Normal response codes: 200
 
-Error response codes: 400,401,413,503,500
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -468,7 +476,9 @@ Delete QoS policy
 
 Deletes a QoS policy.
 
-Error response codes: 204,400,401,413,503,500
+Normal response codes: 204
+
+Error response codes: 400, 401, 413
 
 Request
 -------
@@ -488,7 +498,7 @@ The list might be empty.
 
 Normal response codes: 200
 
-Error response codes: 500,401,503
+Error response codes: 401
 
 Request
 -------
@@ -521,7 +531,9 @@ Create bandwidth limit rule
 
 Creates a bandwidth limit rule for a QoS policy.
 
-Error response codes: 201,404,409,401,413,503,500
+Normal response codes: 201
+
+Error response codes: 401, 404, 409, 413
 
 Request
 -------
diff --git a/api-ref/source/v2/quotas.inc b/api-ref/source/v2/quotas.inc
index eefd08d7c..2b756d52b 100644
--- a/api-ref/source/v2/quotas.inc
+++ b/api-ref/source/v2/quotas.inc
@@ -152,7 +152,9 @@ Reset quota for a project
 
 Resets quotas to default values for a project.
 
-Error response codes: 204, 401, 403, 404
+Normal response codes: 204
+
+Error response codes: 401, 403, 404
 
 Request
 -------
diff --git a/api-ref/source/v2/segments.inc b/api-ref/source/v2/segments.inc
index 315559979..f40bb0acd 100644
--- a/api-ref/source/v2/segments.inc
+++ b/api-ref/source/v2/segments.inc
@@ -22,7 +22,7 @@ and-column-selection>`__.
 
 Normal response codes: 200
 
-Error response codes: 404,401
+Error response codes: 401, 404
 
 Request
 -------
@@ -59,7 +59,7 @@ Updates a segment.
 
 Normal response codes: 200
 
-Error response codes: 404,403,401,400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -104,7 +104,7 @@ Deletes a segment and its associated resources.
 
 Normal response codes: 204
 
-Error response codes: 409,404,401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -169,7 +169,7 @@ Creates a segment.
 
 Normal response codes: 201
 
-Error response codes: 401,400
+Error response codes: 400, 401
 
 Request
 -------
diff --git a/api-ref/source/v2/subnetpools.inc b/api-ref/source/v2/subnetpools.inc
index 39d21fb27..1a77036a0 100644
--- a/api-ref/source/v2/subnetpools.inc
+++ b/api-ref/source/v2/subnetpools.inc
@@ -21,7 +21,7 @@ For information, see `Filtering and Column Selection <https://wiki.openstack.org
 
 Normal response codes: 200
 
-Error response codes: 404, 401
+Error response codes: 401, 404
 
 Request
 -------
@@ -70,7 +70,7 @@ Updates a subnet pool.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -138,7 +138,7 @@ are still in use.
 
 Normal response codes: 204
 
-Error response codes: 404, 401
+Error response codes: 401, 404
 
 Request
 -------
@@ -218,7 +218,7 @@ Creates a subnet pool.
 
 Normal response codes: 201
 
-Error response codes: 404, 403, 401, 400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
diff --git a/api-ref/source/v2/subnets.inc b/api-ref/source/v2/subnets.inc
index 3d86d09ee..78c830ee3 100644
--- a/api-ref/source/v2/subnets.inc
+++ b/api-ref/source/v2/subnets.inc
@@ -116,7 +116,7 @@ only supported for provider networks.
 
 Normal response codes: 201
 
-Error response codes: 404, 403, 401, 400, 409
+Error response codes: 400, 401, 403, 404, 409
 
 Request
 -------
@@ -193,7 +193,7 @@ subnets in the request body are created.
 
 Normal response codes: 201
 
-Error response codes: 404, 403, 401, 400, 409
+Error response codes: 400, 401, 403, 404, 409
 
 Request
 -------
@@ -269,7 +269,7 @@ Use the fields query parameter to filter the results.
 
 Normal response codes: 200
 
-Error response codes: 404,401
+Error response codes: 401, 404
 
 Request
 -------
@@ -325,7 +325,7 @@ attributes results in a ``400 Bad Request`` error.
 
 Normal response codes: 200
 
-Error response codes: 404,403,401,400
+Error response codes: 400, 401, 403, 404
 
 Request
 -------
@@ -392,7 +392,7 @@ The operation fails if subnet IP addresses are still allocated.
 
 Normal response codes: 204
 
-Error response codes: 404, 401
+Error response codes: 401, 404
 
 Request
 -------
diff --git a/api-ref/source/v2/trunk.inc b/api-ref/source/v2/trunk.inc
index 75bdf54bd..1f78bba3f 100644
--- a/api-ref/source/v2/trunk.inc
+++ b/api-ref/source/v2/trunk.inc
@@ -40,7 +40,7 @@ section for more details.
 
 Normal response codes: 200
 
-Error response codes: 401,404
+Error response codes: 401, 404
 
 Response Parameters
 -------------------
@@ -94,7 +94,9 @@ Error codes:
   - A system configuration prevents the operation from succeeding.
 
 
-Error response codes: 201,400,401,404,409
+Normal response codes: 201
+
+Error response codes: 400, 401, 404, 409
 
 Request
 -------
@@ -141,7 +143,7 @@ Add subports to trunk
 
 Normal response codes: 200
 
-Error response codes: 400,401,404,409
+Error response codes: 400, 401, 404, 409
 
 Request
 -------
@@ -191,7 +193,7 @@ Delete subports from trunk
 
 Normal response codes: 200
 
-Error response codes: 400,401,404,409
+Error response codes: 400, 401, 404, 409
 
 Request
 -------
@@ -239,7 +241,7 @@ List subports for trunk
 
 Normal response codes: 200
 
-Error response codes: 401,404
+Error response codes: 401, 404
 
 Request
 -------
@@ -275,7 +277,7 @@ that it prevents operations such as as adding/removing subports.
 
 Normal response codes: 200
 
-Error response codes: 400,401,404,409
+Error response codes: 400, 401, 404, 409
 
 Request
 -------
@@ -334,7 +336,7 @@ and-column-selection>`__.
 
 Normal response codes: 200
 
-Error response codes: 404,401
+Error response codes: 401, 404
 
 Request
 -------
@@ -377,7 +379,7 @@ Deletes a trunk, if its state allows it.
 
 Normal response codes: 204
 
-Error response codes: 401,404,409
+Error response codes: 401, 404, 409
 
 Request
 -------
diff --git a/api-ref/source/v2/vpnaas.inc b/api-ref/source/v2/vpnaas.inc
index 09f1982dd..623eedb2d 100644
--- a/api-ref/source/v2/vpnaas.inc
+++ b/api-ref/source/v2/vpnaas.inc
@@ -60,7 +60,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -108,7 +108,7 @@ encryption algorithms for connections.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -171,7 +171,7 @@ Shows details for an IKE policy.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -216,7 +216,7 @@ Updates policy settings in an IKE policy.
 
 Normal response codes: 200
 
-Error response codes: 404, 401, 400
+Error response codes: 400, 401, 404
 
 Request
 -------
@@ -278,7 +278,7 @@ Removes an IKE policy.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -307,7 +307,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -355,7 +355,7 @@ connection.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -418,7 +418,7 @@ Shows details for an IPSec policy.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -463,7 +463,7 @@ Updates policy settings in an IPSec policy.
 
 Normal response codes: 200
 
-Error response codes: 404, 401, 400
+Error response codes: 400, 401, 404
 
 Request
 -------
@@ -525,7 +525,7 @@ Removes an IPSec policy.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -554,7 +554,7 @@ and-column-selection>`__.
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -609,7 +609,7 @@ Creates a site-to-site IPSec connection for a service.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -694,7 +694,7 @@ Shows details for an IPSec connection.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -750,7 +750,7 @@ Updates connection settings for an IPSec connection.
 
 Normal response codes: 200
 
-Error response codes: 404, 401, 400
+Error response codes: 400, 401, 404
 
 Request
 -------
@@ -829,7 +829,7 @@ Removes an IPSec connection.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -858,7 +858,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -898,7 +898,7 @@ type that you can use to create a VPN connections.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -946,7 +946,7 @@ Shows details for a VPN endpoint group.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -983,7 +983,7 @@ Updates settings for a VPN endpoint group.
 
 Normal response codes: 200
 
-Error response codes: 404, 401, 400
+Error response codes: 400, 401, 404
 
 Request
 -------
@@ -1028,7 +1028,7 @@ Removes a VPN endpoint group.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------
@@ -1059,7 +1059,7 @@ and Column Selection <https://wiki.openstack.org/wiki/Neutron/APIv2
 
 Normal response codes: 200
 
-Error response codes: 403, 401
+Error response codes: 401, 403
 
 Request
 -------
@@ -1104,7 +1104,7 @@ service, it can contain multiple VPN connections.
 
 Normal response codes: 201
 
-Error response codes: 401, 400
+Error response codes: 400, 401
 
 Request
 -------
@@ -1163,7 +1163,7 @@ operation returns the ``Forbidden (403)`` response code.
 
 Normal response codes: 200
 
-Error response codes: 404, 403, 401
+Error response codes: 401, 403, 404
 
 Request
 -------
@@ -1208,7 +1208,7 @@ service with a ``PENDING_*`` status.
 
 Normal response codes: 200
 
-Error response codes: 404, 401, 400
+Error response codes: 400, 401, 404
 
 Request
 -------
@@ -1262,7 +1262,7 @@ If the service has connections, the request is rejected.
 
 Normal response codes: 204
 
-Error response codes: 409, 404, 401
+Error response codes: 401, 404, 409
 
 Request
 -------