Merge "Fix typos from oslo_messaging/_drivers/protocols/amqp/opts.py"

doc/common/samples/ceilometer.conf

@@ -910,7 +910,7 @@
 # Deprecated group/name - [amqp1]/trace
 #trace = false
 
-# CA certificate PEM file for verifing server certificate (string
+# CA certificate PEM file to verify server certificate (string
 # value)
 # Deprecated group/name - [amqp1]/ssl_ca_file
 #ssl_ca_file =

doc/common/samples/cinder.conf.sample

@@ -2625,7 +2625,7 @@
 # Debug: dump AMQP frames to stdout (boolean value)
 #trace=false
 
-# CA certificate PEM file for verifing server certificate
+# CA certificate PEM file to verify server certificate
 # (string value)
 #ssl_ca_file=
 

doc/common/tables/ceilometer-conf-changes.xml

@@ -150,7 +150,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/ceilometer-rpc.xml

@@ -81,7 +81,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/cinder-conf-changes.xml

@@ -418,7 +418,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/cinder-rpc.xml

@@ -85,7 +85,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/glance-conf-changes.xml

@@ -254,7 +254,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/glance-rpc.xml

@@ -85,7 +85,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/heat-conf-changes.xml

@@ -134,7 +134,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/heat-rpc.xml

@@ -74,7 +74,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/ironic-rpc.xml

@@ -81,7 +81,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/keystone-conf-changes.xml

@@ -186,7 +186,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/keystone-rpc.xml

@@ -70,7 +70,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/neutron-conf-changes.xml

@@ -614,7 +614,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/neutron-rpc.xml

@@ -92,7 +92,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/nova-conf-changes.xml

@@ -362,7 +362,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/nova-rpc.xml

@@ -88,7 +88,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/sahara-conf-changes.xml

@@ -158,7 +158,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/sahara-rpc.xml

@@ -70,7 +70,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>

doc/common/tables/trove-conf-changes.xml

@@ -178,7 +178,7 @@
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_ca_file = </td>
-      <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+      <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
     </tr>
     <tr>
       <td>[oslo_messaging_amqp] ssl_cert_file = </td>

doc/common/tables/trove-rpc.xml

@@ -78,7 +78,7 @@
       </tr>
       <tr>
         <td><option>ssl_ca_file</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) CA certificate PEM file for verifing server certificate</td>
+        <td>(StrOpt) CA certificate PEM file to verify server certificate</td>
       </tr>
       <tr>
         <td><option>ssl_cert_file</option> = <replaceable></replaceable></td>