Sync with latest script

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index e21c9779a..5eded6cb6 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -97,8 +97,8 @@ qmake [options] files
 <li><p>warn_on - The compiler should emit more warnings than normally, ignored if "warn_off" is specified</p>
 <li><p>warn_off - The compiler should only emit severe warnings.</p>
 </ul><p>These options define the application/library type:</p>
-<ul><li><p>qt - The target is a TQt application/library and retquires the TQt header files/library. The proper include and library paths for the TQt library will automatically be added to the project.</p>
-<li><p>opengl - The target retquires the OpenGL (or Mesa) headers/libraries. The proper include and library paths for these libraries will automatically be added to the project.</p>
+<ul><li><p>qt - The target is a TQt application/library and requires the TQt header files/library. The proper include and library paths for the TQt library will automatically be added to the project.</p>
+<li><p>opengl - The target requires the OpenGL (or Mesa) headers/libraries. The proper include and library paths for these libraries will automatically be added to the project.</p>
 <li><p>thread - The target is a multi-threaded application or library. The proper defines and compiler flags will automatically be added to the project.</p>
 <li><p>x11 - The target is a X11 application or library. The proper include paths and libraries will automatically be added to the project.</p>
 <li><p>windows - The target is a Win32 window application (app only). The proper include paths,compiler flags and libraries will automatically be added to the project.</p>
@@ -141,7 +141,7 @@ DEFINES += USE_MY_STUFF QT_DLL
 <p>Specifies where to copy the <a href="qmake-manual-8.html#TARGET">target</a> dll.</p>
 <a name="HEADERS"></a><h5><a name="4-1-6"></a>HEADERS</h5>
 <p>Defines the header files for the project.</p>
-<p><em>qmake</em> will generate dependency information (unless -nodepend is specified on the <a href="qmake-manual-8.html#Commands">command line</a>) for the specified headers. <em>qmake</em> will also automatically detect if <em>moc</em> is retquired by the classes in these headers, and add the appropriate dependencies and files to the project for generating and linking the moc files.</p>
+<p><em>qmake</em> will generate dependency information (unless -nodepend is specified on the <a href="qmake-manual-8.html#Commands">command line</a>) for the specified headers. <em>qmake</em> will also automatically detect if <em>moc</em> is required by the classes in these headers, and add the appropriate dependencies and files to the project for generating and linking the moc files.</p>
 <p>For example:</p>
 <pre>
 HEADERS = myclass.h \
@@ -156,7 +156,7 @@ HEADERS = myclass.h \
   INCLUDEPATH = c:\msdev\include d:\stl\include
 </pre>
 <a name="FORMS"></a><h5><a name="4-1-8"></a>FORMS</h5>
-<p>This variable specifies the .ui files (see <a href="designer-manual.html">TQt Designer</a>) to be processed through <em>uic</em> before compiling. All dependencies, headers and source files retquired to build these .ui files will automatically be added to the project.</p>
+<p>This variable specifies the .ui files (see <a href="designer-manual.html">TQt Designer</a>) to be processed through <em>uic</em> before compiling. All dependencies, headers and source files required to build these .ui files will automatically be added to the project.</p>
 <p>For example:</p>
 <pre>
 FORMS = mydialog.ui \
@@ -303,7 +303,7 @@ message($$join(urlPieces, $$LITERAL_HASH))
 <a name="PRECOMPILED_HEADER"></a><h5><a name="4-2-10"></a>PRECOMPILED_HEADER</h5>
 <p>This variable indicates the header file for creating a precompiled header file, to increase the compilation speed of a project. Precompiled headers are currently only supported on some platforms (Windows - all MSVC project types, Mac OS X - Xcode, Makefile, UNIX - gcc 3.3 and up).</p>
 <p>On other platforms, this variable has different meaning, as noted below.</p>
-<p>This variable contains a list of header files that retquire some sort of pre-compilation step (such as with moc). 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>
+<p>This variable contains a list of header files that require some sort of pre-compilation step (such as with moc). 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"></a><h5><a name="4-2-11"></a>QMAKE</h5>
 <p>This variable contains the name of the <em>qmake</em> program itself and is placed in generated makefiles. 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="QMAKESPEC_systemvariable"></a><h5><a name="4-2-12"></a>QMAKESPEC</h5>
@@ -370,7 +370,7 @@ app {
 <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>
-<p>This variable contains the list of retquirements 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>
+<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>
 <a name="QMAKE_INCDIR"></a><h5><a name="4-2-40"></a>QMAKE_INCDIR</h5>
@@ -642,7 +642,7 @@ QMAKE_VERS = $$[QMAKE_VERSION]
 </pre>
 <a name="Environment"></a><h3><a name="7"></a>Environment Variables and Configuration</h3>
 <a name="QMAKESPEC"></a><h4><a name="7-1"></a>QMAKESPEC</h4>
-<p><em>qmake</em> retquires a platform and compiler description file which contains many default values used to generate appropriate makefiles. The standard TQt distribution comes with many of these files, located in the 'mkspecs' subdirectory of the TQt installation.</p>
+<p><em>qmake</em> requires a platform and compiler description file which contains many default values used to generate appropriate makefiles. The standard TQt distribution comes with many of these files, located in the 'mkspecs' subdirectory of the TQt installation.</p>
 <p>The QMAKESPEC environment variable can contain any of the following:</p>
 <ul><li><p>A complete path to a directory containing a qmake.conf file. In this case <em>qmake</em> will open the qmake.conf file from within that directory. If the file does not exist, <em>qmake</em> will exit with an error.</p>
 <li><p>The name of a platform-compiler combination. In this case, <em>qmake</em> will search in the directory specified by the QTDIR environment variable.</p>
@@ -657,7 +657,7 @@ QMAKE_VERS = $$[QMAKE_VERSION]
 <pre>
   INSTALLS += documentation
 </pre>
-<p>Now <em>qmake</em> will take over making sure the correct things are copied to the specified places. If however you retquire greater control you may use the 'extra' member of the object:</p>
+<p>Now <em>qmake</em> will take over making sure the correct things are copied to the specified places. If however you require greater control you may use the 'extra' member of the object:</p>
 <pre>
   unix:documentation.extra = create_docs; mv master.doc toc.doc
 </pre>
@@ -670,7 +670,7 @@ QMAKE_VERS = $$[QMAKE_VERSION]
 <a name="cache"></a><h4><a name="7-3"></a>Cache File</h4>
 <p>The cache file (mentioned above in the options) is a special file <em>qmake</em> will read to find settings not specified in the <tt>qmake.conf</tt> file, the .pro file, or the command line. If <tt>-nocache</tt> is not specified, <em>qmake</em> will try to find a file called <tt>.qmake.cache</tt> in parent directories. If it fails to find this file, it will silently ignore this step of processing.</p>
 <a name="LibDepend"></a><h4><a name="7-4"></a>Library Dependencies</h4>
-<p>Often when linking against a library <em>qmake</em> relies on the underlying platform to know what other libraries this library links against, and lets the platform pull them in. In many cases, however, this is not sufficent. For example when statically linking a library there are no libraries linked against, and therefore no dependencies to those libraries are created - however an application that later links against this library will need to know where to find the symbols that the linked in library will retquire. To help with this situation <em>qmake</em> will follow a library's dependencies when it feels appropriate, however this behaviour must be enabled in <em>qmake</em>. To enable retquires two steps. First, you must enable it in the library - to do this you must tell <em>qmake</em> to save information about this library:</p>
+<p>Often when linking against a library <em>qmake</em> relies on the underlying platform to know what other libraries this library links against, and lets the platform pull them in. In many cases, however, this is not sufficent. For example when statically linking a library there are no libraries linked against, and therefore no dependencies to those libraries are created - however an application that later links against this library will need to know where to find the symbols that the linked in library will require. To help with this situation <em>qmake</em> will follow a library's dependencies when it feels appropriate, however this behaviour must be enabled in <em>qmake</em>. To enable requires two steps. First, you must enable it in the library - to do this you must tell <em>qmake</em> to save information about this library:</p>
 <pre>
   CONFIG += create_prl
 </pre>