Squashed commit of the following:

commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620
Author: David Boddie <dboddie@trolltech.com>
Date:   Tue Mar 24 16:55:41 2009 +0100

    Removed internal, hidden documentation.

    Also fixed the language used, slightly.

    Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

commit 0a81cc2a6dfc98087de92e53d493bed56826642f
Merge: 4bd3eca... dd7b1f1...
Author: David Boddie <dboddie@trolltech.com>
Date:   Tue Mar 24 15:24:32 2009 +0100

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

commit 4bd3eca8855bb2564e146be4d0a3bba836d20122
Merge: dc789e3... 1d1c52c...
Author: David Boddie <dboddie@trolltech.com>
Date:   Mon Mar 23 19:20:05 2009 +0100

    Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5

commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6
Merge: 6c5de23... 381b6cc...
Author: David Boddie <dboddie@trolltech.com>
Date:   Mon Mar 23 19:17:37 2009 +0100

    Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5

commit 6c5de23611baef3c6be59b94ebd29d901056c2fc
Author: David Boddie <dboddie@trolltech.com>
Date:   Thu Mar 19 18:26:11 2009 +0100

    Fixes:    Doc: Fixed typo.

    Reviewed-by:    David Boddie <dboddie@trolltech.com>

commit 5d710cc183699513b1582507dcb4cddefb91c8ad
Author: David Boddie <dboddie@trolltech.com>
Date:   Thu Mar 19 18:24:31 2009 +0100

    Fixes:    Doc: Made it clearer what qDebug() actually does.

    Reviewed-by:    David Boddie <dboddie@trolltech.com>

commit 1fae0b3b34bf066e2356671a5c6187485b2b587d
Author: David Boddie <dboddie@trolltech.com>
Date:   Thu Mar 19 17:53:09 2009 +0100

    Fixes:    Doc: Added a note about not modifying the text document in a paint event handler.

    Task-number: 246550
    Reviewed-by: David Boddie <dboddie@trolltech.com>

commit 29662d44de9b42d811e60a1b57d871335888373a
Author: David Boddie <dboddie@trolltech.com>
Date:   Thu Mar 19 17:04:07 2009 +0100

    Fixes:    Doc: Fixed styling of code in this tutorial.

    Task-number: 247053
    Reviewed-by: David Boddie <dboddie@trolltech.com>

commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4
Author: David Boddie <dboddie@trolltech.com>
Date:   Thu Mar 19 15:19:24 2009 +0100

    Fixes:    Doc: Note the use of just the name of a method rather than a complete signature.

    Task-number: 247857
    Reviewed-by: David Boddie <dboddie@trolltech.com>

1 files changed, 1 insertions, 63 deletions

diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 46d3b3b155..e10a5beb73 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -2515,71 +2515,9 @@ pixmap property in the property editor.
 
            This library would then be used by the application as well as by the
            \QD plugin. Care must be taken to ensure that the plugin can locate
-          the library at runtime.
+          the library at run-time.
     \endlist
 
-
-
-\omit
-    \section1 Using Qt Script to Aid in Building Forms
-
-    Starting with Qt 4.3, \c .ui files may contain
-    \l{QtScript}{Qt Script} snippets that are executed by \l uic or QUiLoader
-    when building forms.
-
-    The snippets are executed per widget. The snippet may modify properties
-    or invoke slots on the widget.
-
-    Special variables are used to access the widget:
-
-    \table
-    \header
-    \o Name
-    \o Value
-    \row \o \c  widget
-         \o The widget being built.
-    \row \o \c  childWidgets
-         \o An array containing the child widgets. This is useful
-         for QDesignerContainerExtension subclasses.
-    \endtable
-
-    If scripts are present in an \c {uic}-generated form, the application
-    must be configured with Qt Script support.
-
-    \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 5
-
-    For security reasons, the execution of scripts is disabled
-    by default in QUiLoader. You can enable it by
-    calling the QUiLoader::setScriptingEnabled() method.
-
-    The resulting script snippet is concatenated from snippets occurring in
-    several places:
-
-    \table
-    \header
-    \o Source
-    \o Usage
-    \row \o The \c codeTemplate() function of QDesignerCustomWidgetInterface
-         \o Allows snippets to be run on a per-class basis; for example, to set up a
-            container using the QDesignerContainerExtension.
-    \row \o The \c script() method of QDesignerScriptExtension
-         \o Allows snippets to be run on a per-widget basis; for example,
-            to set up the internal state of a custom widget.
-
-            Such an internal state might be, for example, the contents of
-            a custom item view container widget, for which an editor
-            is provided by an QDesignerTaskMenuExtension object.
-
-    \row \o Snippets entered at run-time using the \gui{Change script...}
-            option of the form's context menu
-         \o Fast prototyping. To get an idea,
-            drag a QLineEdit onto the form, enter the script
-            \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 6
-            and preview the form.
-    \endtable
-\endomit
-
-
     \section1 Related Examples
 
     For more information on using custom widgets in \QD, refer to the