Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

10 files changed, 34 insertions, 39 deletions

diff --git a/doc/src/examples/arrowpad.qdoc b/doc/src/examples/arrowpad.qdoc
index 9e9268c..fa19fbb 100644
--- a/doc/src/examples/arrowpad.qdoc
+++ b/doc/src/examples/arrowpad.qdoc
@@ -140,10 +140,10 @@
     QLocale::system() can be influenced by setting the \c LANG
     environment variable, for example. Notice that the use of a naming
     convention that incorporates the locale for \c .qm message files,
-    (and \c .ts files), makes it easy to implement choosing the
+    (and TS files), makes it easy to implement choosing the
     translation file according to locale.
 
-    If there is no \c .qm message file for the locale chosen the original
+    If there is no QM message file for the locale chosen the original
     source text will be used and no error raised.
 
     \section1 Translating to French and Dutch
@@ -194,9 +194,9 @@
     \endlist
 
     We have to convert the \c tt1_fr.ts and \c tt1_nl.ts translation source
-    files into \c .qm files. We could use \e {Qt Linguist} as we've done
+    files into QM files. We could use \e {Qt Linguist} as we've done
     before; however using the command line tool \c lrelease ensures that
-    \e all the \c .qm files for the application are created without us
+    \e all the QM files for the application are created without us
     having to remember to load and \gui File|Release each one
     individually from \e {Qt Linguist}.
 
diff --git a/doc/src/examples/calculatorform.qdoc b/doc/src/examples/calculatorform.qdoc
index 7cbf2ac..90eef3b 100644
--- a/doc/src/examples/calculatorform.qdoc
+++ b/doc/src/examples/calculatorform.qdoc
@@ -45,8 +45,8 @@
 
     The Calculator Form Example shows how to use a form created with
     \QD in an application by using the user interface information from
-    a QWidget subclass.  We use \l{Using a Designer .ui File in Your Application} 
-    {uic's auto-connection} feature to automatically connect signals 
+    a QWidget subclass.  We use \l{Using a Designer UI File in Your Application}
+    {uic's auto-connection} feature to automatically connect signals
     from widgets on the form to slots in our code.
 
     \image calculatorform-example.png Screenshot of the Calculator Form example
@@ -59,7 +59,7 @@
     \section1 Preparation
 
     The user interface for this example is designed completely using \QD. The
-    result is a .ui file describing the form, the widgets used, any signal-slot
+    result is a UI file describing the form, the widgets used, any signal-slot
     connections between them, and other standard user interface properties.
 
     To ensure that the example can use this file, we need to include a \c FORMS
diff --git a/doc/src/examples/helloscript.qdoc b/doc/src/examples/helloscript.qdoc
index a18e4ad..1b0f43c 100644
--- a/doc/src/examples/helloscript.qdoc
+++ b/doc/src/examples/helloscript.qdoc
@@ -121,7 +121,7 @@
     window). Don't forget the exclamation mark!
 
     Click the \gui Done checkbox and choose \gui File|Save from the
-    menu bar. The \c .ts file will no longer contain
+    menu bar. The TS file will no longer contain
 
     \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 3
 
@@ -129,11 +129,11 @@
 
     \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 4
 
-    To see the application running in Latin, we have to generate a \c .qm
-    file from the \c .ts file. Generating a \c .qm file can be achieved
-    either from within \e {Qt Linguist} (for a single \c .ts file), or
-    by using the command line program \c lrelease which will produce one \c
-    .qm file for each of the \c .ts files listed in the project file.
+    To see the application running in Latin, we have to generate a QM
+    file from the TS file. Generating a QM file can be achieved
+    either from within \e {Qt Linguist} (for a single TS file), or
+    by using the command line program \c lrelease which will produce one
+    QM file for each of the TS files listed in the project file.
     Generate \c hellotr_la.qm from \c hellotr_la.ts by choosing
     \gui File|Release from \e {Qt Linguist}'s menu bar and pressing
     \gui Save in the file save dialog that pops up. Now run the \c helloscript
diff --git a/doc/src/examples/hellotr.qdoc b/doc/src/examples/hellotr.qdoc
index bb38737..18e0715 100644
--- a/doc/src/examples/hellotr.qdoc
+++ b/doc/src/examples/hellotr.qdoc
@@ -108,12 +108,12 @@
     Note that the file extension is \c .ts, not \c .qm. The \c .ts
     translation source format is designed for use during the
     application's development. Programmers or release managers run
-    the \c lupdate program to generate and update \c .ts files with
+    the \c lupdate program to generate and update TS files with
     the source text that is extracted from the source code.
-    Translators read and update the \c .ts files using \e {Qt
+    Translators read and update the TS files using \e {Qt
     Linguist} adding and editing their translations.
 
-    The \c .ts format is human-readable XML that can be emailed directly
+    The TS format is human-readable XML that can be emailed directly
     and is easy to put under version control. If you edit this file
     manually, be aware that the default encoding for XML is UTF-8, not
     Latin1 (ISO 8859-1). One way to type in a Latin1 character such as
@@ -121,8 +121,8 @@
     "\ø". This will work for any Unicode 4.0 character.
 
     Once the translations are complete the \c lrelease program is used to
-    convert the \c .ts files into the \c .qm Qt message file format. The
-    \c .qm format is a compact binary format designed to deliver very
+    convert the TS files into the QM Qt message file format. The
+    QM format is a compact binary format designed to deliver very
     fast lookup performance. Both \c lupdate and \c lrelease read all the
     project's source and header files (as specified in the HEADERS and
     SOURCES lines of the project file) and extract the strings that
@@ -131,7 +131,7 @@
     \c lupdate is used to create and update the message files (\c hellotr_la.ts
     in this case) to keep them in sync with the source code. It is safe to
     run \c lupdate at any time, as \c lupdate does not remove any
-    information. For example, you can put it in the makefile, so the \c .ts
+    information. For example, you can put it in the makefile, so the TS
     files are updated whenever the source changes.
 
     Try running \c lupdate right now, like this:
@@ -151,7 +151,7 @@
 
     We will use \e {Qt Linguist} to provide the translation, although
     you can use any XML or plain text editor to enter a translation into a
-    \c .ts file.
+    TS file.
 
     To start \e {Qt Linguist}, type
 
@@ -163,7 +163,7 @@
     window). Don't forget the exclamation mark!
 
     Click the \gui Done checkbox and choose \gui File|Save from the
-    menu bar. The \c .ts file will no longer contain
+    menu bar. The TS file will no longer contain
 
     \snippet doc/src/snippets/code/doc_src_examples_hellotr.qdoc 3
 
@@ -173,11 +173,11 @@
 
     \section1 Running the Application in Latin
 
-    To see the application running in Latin, we have to generate a \c .qm
-    file from the \c .ts file. Generating a \c .qm file can be achieved
-    either from within \e {Qt Linguist} (for a single \c .ts file), or
-    by using the command line program \c lrelease which will produce one \c
-    .qm file for each of the \c .ts files listed in the project file.
+    To see the application running in Latin, we have to generate a QM
+    file from the TS file. Generating a QM file can be achieved
+    either from within \e {Qt Linguist} (for a single TS file), or
+    by using the command line program \c lrelease which will produce one
+    QM file for each of the TS files listed in the project file.
     Generate \c hellotr_la.qm from \c hellotr_la.ts by choosing
     \gui File|Release from \e {Qt Linguist}'s menu bar and pressing
     \gui Save in the file save dialog that pops up. Now run the \c hellotr
diff --git a/doc/src/examples/multipleinheritance.qdoc b/doc/src/examples/multipleinheritance.qdoc
index 5a77275..1622fb0 100644
--- a/doc/src/examples/multipleinheritance.qdoc
+++ b/doc/src/examples/multipleinheritance.qdoc
@@ -103,6 +103,6 @@
 
     There are various approaches to include forms into applications. The
     Multiple Inheritance approach is just one of them. See
-    \l{Using a Designer .ui File in Your Application} for more information on
+    \l{Using a Designer UI File in Your Application} for more information on
     the other approaches available.
 */
diff --git a/doc/src/examples/qtscripttetrix.qdoc b/doc/src/examples/qtscripttetrix.qdoc
index c94697a..fb2d537 100644
--- a/doc/src/examples/qtscripttetrix.qdoc
+++ b/doc/src/examples/qtscripttetrix.qdoc
@@ -57,7 +57,7 @@
 
     \section1 Setting up the GUI
 
-    The graphical user interface is defined in a \c{.ui} file, creating
+    The graphical user interface is defined in a UI file, created
     using Qt Designer, and is set up in the example's C++ \c{main.cpp} file.
 
     \snippet examples/script/qstetrix/main.cpp 0
diff --git a/doc/src/examples/simpletextviewer.qdoc b/doc/src/examples/simpletextviewer.qdoc
index 87eae57..2531a86 100644
--- a/doc/src/examples/simpletextviewer.qdoc
+++ b/doc/src/examples/simpletextviewer.qdoc
@@ -198,12 +198,7 @@
           <file>openfile.html</file>
           <file>wildcardmatching.html</file>
           <file>images/browse.png</file>
-          <file>images/fadedfilemenu.png</file>
-          <file>images/filedialog.png</file>
-          <file>images/handbook.png</file>
-          <file>images/mainwindow.png</file>
-          <file>images/open.png</file>
-          <file>images/wildcard.png</file>
+          <file>images/*.png</file>
         </files>
       </filterSection>
     </QtHelpProject>
diff --git a/doc/src/examples/svggenerator.qdoc b/doc/src/examples/svggenerator.qdoc
index 09fe6e1..dd7459a 100644
--- a/doc/src/examples/svggenerator.qdoc
+++ b/doc/src/examples/svggenerator.qdoc
@@ -55,8 +55,8 @@
     The example consists of two classes: \c Window and \c DisplayWidget.
 
     The \c Window class contains the application logic and constructs the user
-    interface from a Qt Designer \c{.ui} file as described in the
-    \l{Using a Designer .ui File in Your Application#The Multiple Inheritance Approach}{Qt Designer manual}.
+    interface from a Qt Designer UI file as described in the
+    \l{Using a Designer UI File in Your Application#The Multiple Inheritance Approach}{Qt Designer manual}.
     It also contains the code to write an SVG file.
 
     The \c DisplayWidget class performs all the work of painting a picture on
diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc
index adbbd0d..acfbd0f 100644
--- a/doc/src/examples/textfinder.qdoc
+++ b/doc/src/examples/textfinder.qdoc
@@ -45,7 +45,7 @@
 
     The Text Finder example demonstrates how to dynamically process forms
     using the QtUiTools module. Dynamic form processing enables a form to
-    be processed at run-time only by changing the .ui file for the project.
+    be processed at run-time only by changing the UI file for the project.
     The program allows the user to look up a particular word within the
     contents of a text file. This text file is included in the project's
     resource and is loaded into the display at startup.
@@ -95,7 +95,7 @@
     \snippet examples/uitools/textfinder/textfinder.h 0
 
     The slot \c{on_find_Button_clicked()} is a slot named according to the
-    \l{Using a Designer .ui File in Your Application#Automatic Connections}
+    \l{Using a Designer UI File in Your Application#Automatic Connections}
     {Automatic Connection} naming convention required
     by \c uic.
 
diff --git a/doc/src/examples/worldtimeclockbuilder.qdoc b/doc/src/examples/worldtimeclockbuilder.qdoc
index 55246e9..f38062a 100644
--- a/doc/src/examples/worldtimeclockbuilder.qdoc
+++ b/doc/src/examples/worldtimeclockbuilder.qdoc
@@ -66,7 +66,7 @@
   generate a dependency on the \c libQtUiTools library containing the QtUiTools
   classes.
 
-  Note that we do not inform \c qmake about any .ui files, and so none will
+  Note that we do not inform \c qmake about any UI files, and so none will
   be processed and built into the application. The resource file contains
   an entry for the particular form that we wish to use: