summaryrefslogtreecommitdiffstats
path: root/doc/misc.doc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:04:08 -0600
commite02e31c8b9d854cd62cbe9799228f6e08e882773 (patch)
tree53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /doc/misc.doc
parent143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff)
downloadtqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz
tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip
Sync with latest script
Diffstat (limited to 'doc/misc.doc')
-rw-r--r--doc/misc.doc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/misc.doc b/doc/misc.doc
index cb7c84b3d..3071ce773 100644
--- a/doc/misc.doc
+++ b/doc/misc.doc
@@ -16,7 +16,7 @@
** and the KDE Free Qt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
@@ -93,7 +93,7 @@ tools are usually located in the \c bin subdirectory of Qt distributions.
Either run \c "$QTDIR"/bin/moc and \c "$QTDIR"/bin/uic or add \c "$QTDIR"/bin
to your \c PATH and run \c moc and \c uic. If you use \c qmake the
appropriate lines will be added to your Makefiles so that \e uic and
-\e moc will be executed as retquired.
+\e moc will be executed as required.
<dt>Static or shared libraries - Link time
@@ -391,7 +391,7 @@ and development of free software which uses the Software.
6. You may develop application programs, reusable components and other
software items that link with the original or modified versions of the
Software. These items, when distributed, are subject to the following
- retquirements:
+ requirements:
<blockquote>
a. You must ensure that all recipients of machine-executable forms of
@@ -565,9 +565,9 @@ above, provided that you also meet all of these conditions:
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
- the Program is not retquired to print an announcement.)
+ the Program is not required to print an announcement.)
-These retquirements apply to the modified work as a whole. If
+These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
@@ -633,7 +633,7 @@ However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
- 5. You are not retquired to accept this License, since you have not
+ 5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by