Sync again

11 files changed, 14 insertions, 14 deletions

diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html
index 19df8421b..bcf4ae444 100644
--- a/doc/html/canvas-chart-example.html
+++ b/doc/html/canvas-chart-example.html
@@ -44,7 +44,7 @@ demonstrates basic canvas usage.
 
 CONFIG  += warn_on
 
-RETQUIRES = full-config
+REQUIRES = full-config
 
 HEADERS += element.h \
            canvastext.h \
diff --git a/doc/html/chart-chart-pro.html b/doc/html/chart-chart-pro.html
index 4f439ced5..6b4741791 100644
--- a/doc/html/chart-chart-pro.html
+++ b/doc/html/chart-chart-pro.html
@@ -36,7 +36,7 @@ body { background: #ffffff; color: black; }
 
 CONFIG  += warn_on
 
-RETQUIRES = full-config
+REQUIRES = full-config
 
 HEADERS += element.h \
            canvastext.h \
diff --git a/doc/html/emb-fonts.html b/doc/html/emb-fonts.html
index da3117895..09dc1a4ba 100644
--- a/doc/html/emb-fonts.html
+++ b/doc/html/emb-fonts.html
@@ -64,7 +64,7 @@ fonts and sizes you need, then remove TTF and BDF support.
 <p> See <a href="makeqpf.html">tools/makeqpf</a> for a tool that helps
 produce TQPF files from the TTF and BDF, or just run your application
 with the <tt>-savefonts</tt> option.
-<p> <h2> Memory Retquirements
+<p> <h2> Memory Requirements
 </h2>
 <a name="2"></a><p> With TTF fonts, each character in the font at a given point size is
 only rendered when first used in a drawing or metrics operation. With
diff --git a/doc/html/extension-dialog-example.html b/doc/html/extension-dialog-example.html
index 5951601ca..281905abf 100644
--- a/doc/html/extension-dialog-example.html
+++ b/doc/html/extension-dialog-example.html
@@ -46,7 +46,7 @@ LANGUAGE        = C++
 
 CONFIG          += qt warn_on release
 
-RETQUIRES        = full-config nocrosscompiler
+REQUIRES        = full-config nocrosscompiler
 
 SOURCES         += main.cpp
 FORMS           = mainform.ui \
diff --git a/doc/html/linguist-manual-3.html b/doc/html/linguist-manual-3.html
index 73cee9911..0837075a6 100644
--- a/doc/html/linguist-manual-3.html
+++ b/doc/html/linguist-manual-3.html
@@ -57,7 +57,7 @@ body { background: #ffffff; color: black; }
 <h3><a name="3"></a>Common Tasks</h3>
 <h4><a name="3-1"></a>Leaving a Translation for Later</h4>
 <p>If you wish to leave a translation press <b>Ctrl+L</b> (Next Unfinished) to move to the next unfinished translation. An unfinished translation is one that either has not been translated at all or one which fails validation. To move to the next phrase press <b>Shift+Ctrl+L</b>. You can also navigate using the Translation menu. If you want to go to a different context entirely, click the context you want to work on in the Context list, then click the source text in the Source Text area.</p>
-<h4><a name="3-2"></a>Phrases That Retquire Multiple Translations Depending on Context</h4>
+<h4><a name="3-2"></a>Phrases That Require Multiple Translations Depending on Context</h4>
 <!-- index Contexts!for Translation --><!-- index Comments!for Translators --><p>The same phrase may occur in two or more contexts without conflict. Once a phrase has been translated in one context, <em>TQt Linguist</em> notes that the translation has been made and when the translator reaches a later occurrence of the same phrase <em>TQt Linguist</em> will provide the previous translation as a possible translation candidate in the phrases and guesses area. If the previous translation is acceptable just click the <em>Done &amp; Next</em> button (press <b>Ctrl+Enter</b>) to move on to the next unfinished phrase.</p>
 <p>If a phrase occurs more than once in a particular context it will only be shown once in <em>TQt Linguist</em>'s context list and the translation will be applied to every occurrence within the context. If the same phrase needs to be translated differently within the same context the programmer must provide a distinguishing comment for each of the phrases concerned. If such comments are used the duplicate phrases will appear in the context list. The programmers comments will appear in the translation area on a light blue background.</p>
 <h4><a name="3-3"></a>Changing Keyboard Accelerators</h4>
diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html
index bffd3062a..5be94e04b 100644
--- a/doc/html/linguist-manual-4.html
+++ b/doc/html/linguist-manual-4.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 <pre>
     TQObject::tr("&amp;Quit")
 </pre>
-<h4><a name="1-4"></a>Distinguishing Identical Strings That Retquire Different Translations</h4>
+<h4><a name="1-4"></a>Distinguishing Identical Strings That Require Different Translations</h4>
 <!-- index Translation Contexts --><!-- index Contexts!for Translation --><!-- index lupdate --><p>The <a href="linguist-manual-2.html#2">lupdate</a> program automatically provides a <em>context</em> for every source text. This context is the class name of the class that contains the <tt>tr()</tt> call. This is sufficient in the vast majority of cases. Sometimes however, the translator will need further information to uniquely identify a source text; for example, a dialog that contained two separate frames, each of which contained an "Enabled" option would need each identified because in some languages the translation would differ between the two. This is easily achieved using the two argument form of the <tt>tr()</tt> call, e.g.</p>
 <pre>
     rbc = new TQRadioButton( tr("Enabled", "Color frame"), this );
diff --git a/doc/html/motif-walkthrough-5.html b/doc/html/motif-walkthrough-5.html
index 8d0be21c7..d93d3258a 100644
--- a/doc/html/motif-walkthrough-5.html
+++ b/doc/html/motif-walkthrough-5.html
@@ -43,7 +43,7 @@ removed once we have finished our migration, since we will use
 worth replacing the <em>Print</em> dialog with a custom <a href="qdialog.html">TQDialog</a> replacement.
 Instead, we will keep the <a href="motif-extension.html#Motif">Motif</a> based dialog and use <a href="qmotifdialog.html">TQMotifDialog</a> to
 integrate the dialog with the application.
-<p> <h2> Modality Retquirements
+<p> <h2> Modality Requirements
 </h2>
 <a name="1"></a><p> Modality with TQDialog is different from Motif.  The <a href="qdialog.html#exec">TQDialog::exec</a>()
 function does not return until the dialog is finished.  In Motif,
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index 5eded6cb6..b239495c5 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -212,8 +212,8 @@ win32:UI_HEADERS_DIR = c:\myproject\ui\include
 unix:UI_SOURCES_DIR = ../myproject/ui/src
 win32:UI_SOURCES_DIR = c:\myproject\ui\src
 </pre>
-<a name="RETQUIRES"></a><h5><a name="4-1-16"></a>RETQUIRES</h5>
-<p>This is a special variable processed by <em>qmake</em>. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to RETQUIRES) are missing.</p>
+<a name="REQUIRES"></a><h5><a name="4-1-16"></a>REQUIRES</h5>
+<p>This is a special variable processed by <em>qmake</em>. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to REQUIRES) are missing.</p>
 <p>This is mainly used in TQt's build system for building the examples.</p>
 <a name="SOURCES"></a><h5><a name="4-1-17"></a>SOURCES</h5>
 <p>This variable contains the name of all source files in the project.</p>
@@ -369,7 +369,7 @@ app {
 <p>This variable contains C++ compiler flags for generating compiler warnings. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <a name="QMAKE_EXTENSION_SHLIB"></a><h5><a name="4-2-37"></a>QMAKE_EXTENSION_SHLIB</h5>
 <p>This variable contains the extention for shared libraries. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
-<a name="QMAKE_FAILED_RETQUIREMENTS"></a><h5><a name="4-2-38"></a>QMAKE_FAILED_RETQUIREMENTS</h5>
+<a name="QMAKE_FAILED_REQUIREMENTS"></a><h5><a name="4-2-38"></a>QMAKE_FAILED_REQUIREMENTS</h5>
 <p>This variable contains the list of requirements that were failed to be met when <em>qmake</em> was used. For example, the sql module is needed and wasn't compiled into TQt. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <a name="QMAKE_FILETAGS"></a><h5><a name="4-2-39"></a>QMAKE_FILETAGS</h5>
 <p>This variable contains the file tags needed to be entered into the makefile, such as SOURCES and HEADERS. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html
index 1b9710956..31197dbc1 100644
--- a/doc/html/qmessagebox-h.html
+++ b/doc/html/qmessagebox-h.html
@@ -240,11 +240,11 @@ private:	// Disabled copy constructor and operator=
 *   #include &lt;qmessagebox.h&gt;
 *   int main( int argc, char**argv )
 *   {
-*     QT_RETQUIRE_VERSION( argc, argv, "3.0.5" )
+*     QT_REQUIRE_VERSION( argc, argv, "3.0.5" )
 *     ...
 *   }
 */
-#define QT_RETQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\
+#define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\
 TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()&lt;&lt;16)+\
 (sq.section('.',1,1).toInt()&lt;&lt;8)+sq.section('.',2,2).toInt()&lt;(s.section('.',0,0).toInt()&lt;&lt;16)+\
 (s.section('.',1,1).toInt()&lt;&lt;8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \
diff --git a/doc/html/tutorial2-10.html b/doc/html/tutorial2-10.html
index d234b19d0..badf321c3 100644
--- a/doc/html/tutorial2-10.html
+++ b/doc/html/tutorial2-10.html
@@ -40,7 +40,7 @@ body { background: #ffffff; color: black; }
 
     CONFIG  += warn_on
 
-    RETQUIRES = full-config
+    REQUIRES = full-config
 
     HEADERS += element.h \
                canvastext.h \
diff --git a/doc/qws.doc b/doc/qws.doc
index 419411dc4..746baa962 100644
--- a/doc/qws.doc
+++ b/doc/qws.doc
@@ -226,7 +226,7 @@ See \link makeqpf.html tools/makeqpf\endlink for a tool that helps
 produce QPF files from the TTF and BDF, or just run your application
 with the \c -savefonts option.
 
-\section1 Memory Retquirements
+\section1 Memory Requirements
 
 With TTF fonts, each character in the font at a given point size is
 only rendered when first used in a drawing or metrics operation. With