Sync with latest script

1 files changed, 16 insertions, 16 deletions

diff --git a/doc/html/propertydocs b/doc/html/propertydocs
index 6d8d3e7f2..a3404ce69 100644
--- a/doc/html/propertydocs
+++ b/doc/html/propertydocs
@@ -1115,7 +1115,7 @@ proper behavior and even then QDockWindow does not limit stretchablilty.
     <name>QDockWindow::newLine</name>
     <doc href="qdockwindow.html#newLine-prop">
 &lt;p&gt;This property holds whether the dock window prefers to start a new line in the dock area.
-&lt;p&gt;The default is FALSE, i.e. the dock window doesn't retquire a new
+&lt;p&gt;The default is FALSE, i.e. the dock window doesn't require a new
 line in the dock area.
 
 &lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setNewLine"&gt;setNewLine&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#newLine"&gt;newLine&lt;/a&gt;().
@@ -2145,17 +2145,17 @@ arguments.
 &lt;p&gt; The mask format understands these mask characters:
 &lt;center&gt;&lt;table cellpadding="4" cellspacing="2" border="0"&gt;
 &lt;tr bgcolor="#a2c511"&gt; &lt;th valign="top"&gt;Character &lt;th valign="top"&gt;Meaning
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;A&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphabetic character retquired. A-Z, a-z.
-&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;a&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphabetic character permitted but not retquired.
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;N&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphanumeric character retquired. A-Z, a-z, 0-9.
-&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;n&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphanumeric character permitted but not retquired.
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;X&lt;/tt&gt; &lt;td valign="top"&gt;Any character retquired.
-&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;a href="qwidget.html#x-prop"&gt;x&lt;/a&gt; &lt;td valign="top"&gt;Any character permitted but not retquired.
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;9&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit retquired. 0-9.
-&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;0&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit permitted but not retquired.
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;D&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit retquired. 1-9.
-&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;d&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit permitted but not retquired (1-9).
-&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;#&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit or plus/minus sign permitted but not retquired.
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;A&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphabetic character required. A-Z, a-z.
+&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;a&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphabetic character permitted but not required.
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;N&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphanumeric character required. A-Z, a-z, 0-9.
+&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;n&lt;/tt&gt; &lt;td valign="top"&gt;ASCII alphanumeric character permitted but not required.
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;X&lt;/tt&gt; &lt;td valign="top"&gt;Any character required.
+&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;a href="qwidget.html#x-prop"&gt;x&lt;/a&gt; &lt;td valign="top"&gt;Any character permitted but not required.
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;9&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit required. 0-9.
+&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;0&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit permitted but not required.
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;D&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit required. 1-9.
+&lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;d&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit permitted but not required (1-9).
+&lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;#&lt;/tt&gt; &lt;td valign="top"&gt;ASCII digit or plus/minus sign permitted but not required.
 &lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;&amp;gt;&lt;/tt&gt; &lt;td valign="top"&gt;All following alphabetic characters are uppercased.
 &lt;tr bgcolor="#f0f0f0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;&amp;lt;&lt;/tt&gt; &lt;td valign="top"&gt;All following alphabetic characters are lowercased.
 &lt;tr bgcolor="#d0d0d0"&gt; &lt;td valign="top"&gt;&lt;tt&gt;!&lt;/tt&gt; &lt;td valign="top"&gt;Switch off case conversion.
@@ -3561,7 +3561,7 @@ database client used:
 &lt;li&gt; connect_timeout
 &lt;li&gt; options
 &lt;li&gt; tty
-&lt;li&gt; retquiressl
+&lt;li&gt; requiressl
 &lt;li&gt; service
 &lt;/ul&gt;
 &lt;tr bgcolor="#a2c511"&gt; &lt;th valign="top"&gt;DB2 &lt;th valign="top"&gt;OCI &lt;th valign="top"&gt;TDS
@@ -3587,7 +3587,7 @@ database client used:
     }
     ...
     // PostgreSQL connection
-    db-&amp;gt;setConnectOptions( "retquiressl=1" ); // enable PostgreSQL SSL connections
+    db-&amp;gt;setConnectOptions( "requiressl=1" ); // enable PostgreSQL SSL connections
     if ( !db-&amp;gt;open() ) {
         db-&amp;gt;setConnectOptions(); // clear options
         ...
@@ -3630,7 +3630,7 @@ entry in the ODBC manager:
     ...
     &lt;/pre&gt;
  
-("FIL" is the retquired spelling in Microsoft's API.)
+("FIL" is the required spelling in Microsoft's API.)
 &lt;p&gt; There is no default value.
 
 &lt;p&gt;Set this property's value with &lt;a href="qsqldatabase.html#setDatabaseName"&gt;setDatabaseName&lt;/a&gt;() and get this property's value with &lt;a href="qsqldatabase.html#databaseName"&gt;databaseName&lt;/a&gt;().
@@ -4374,7 +4374,7 @@ that the auto mask calculation works, you should add:
  
 &lt;p&gt; at the end of your event handlers. This is true for all member
 functions that change the appearance of the widget in a way that
-retquires a recalculation of the mask.
+requires a recalculation of the mask.
 &lt;p&gt; While being a technically appealing concept, masks have a big
 drawback: when using complex masks that cannot be expressed easily
 with relatively simple regions, they can be very slow on some