Doc: Simplified Commercial Editions for Qt 4.7.

Reviewed-by: Trust Me
Requested-by: Sales and Legal

1 files changed, 7 insertions, 72 deletions

diff --git a/doc/src/legal/commercialeditions.qdoc b/doc/src/legal/commercialeditions.qdoc
index 4e44376..dde8d69 100644
--- a/doc/src/legal/commercialeditions.qdoc
+++ b/doc/src/legal/commercialeditions.qdoc
@@ -40,61 +40,19 @@
 ****************************************************************************/
 
 /*!
-    \page commercialeditions.html
-    \title Qt Commercial Editions
+    \page commercialedition.html
+    \title Qt Commercial Edition
     \ingroup licensing
     \brief Information about the license and features of the Commercial Edition.
 
-    \keyword Qt Full Framework Edition
-    \keyword Qt GUI Framework Edition
-
-    Two editions of Qt are available under a commercial license:
-    Qt GUI Framework Edition, and Qt Full Framework Edition.
+    Qt can be used to develop closed source software if you obtain a commercial
+    license.
 
     If you want to develop Free or Open Source software for release using a recognized
     Open Source license, you can use the \l{Open Source Versions of Qt}.
 
     The table below summarizes the differences between the two commercial editions:
 
-    \table 75%
-    \header \o{1,2} Features                                      \o{2,1} Editions
-    \header                                                       \o Qt GUI Framework \o Qt Full Framework
-    \row    \o \l{QtCore}{Qt Core classes (QtCore)}               \o \bold{X}         \o \bold{X}
-    \row    \o \l{QtGui}{Qt GUI classes (QtGui)}                  \o \bold{(X)}       \o \bold{X}
-    \row    \o \l{Graphics View Classes} (part of QtGui)          \o                  \o \bold{X}
-    \row    \o \l{QtNetwork}{Networking (QtNetwork)}              \o                  \o \bold{X}
-    \row    \o \l{QtOpenGL}{OpenGL (QtOpenGL)}                    \o                  \o \bold{X}
-    \row    \o \l{QtScript}{Scripting (QtScript)}                 \o                  \o \bold{X}
-    \row    \o \l{QtScriptTools}{Script Debugging (QtScriptTools)}\o                  \o \bold{X}
-    \row    \o \l{QtSql}{Database/SQL (QtSql)}                    \o                  \o \bold{X}
-    \row    \o \l{QtSvg}{SVG (QtSvg)}                             \o                  \o \bold{X}
-    \row    \o \l{QtWebKit}{WebKit integration (QtWebKit)}        \o                  \o \bold{X}
-    \row    \o \l{QtXml}{XML (QtXml)}                             \o                  \o \bold{X}
-    \row    \o \l{QtXmlPatterns}{XQuery and XPath (QtXmlPatterns)}\o                  \o \bold{X}
-    \row    \o \l{Qt3Support}{Qt 3 Support (Qt3Support)}          \o \bold{(X)}       \o \bold{X}
-    \row    \o \l{QtHelp}{Help system (QtHelp)}                   \o                  \o \bold{X}
-    \row    \o \l{QtDBus}{D-Bus IPC support (QtDBus)}             \o \bold{X}         \o \bold{X}
-    \row    \o \l{QtDesigner}{\QD extension classes (QtDesigner)} \o                  \o \bold{X}
-    \row    \o \l{QtTest}{Unit testing framework (QtTest)}        \o \bold{X}         \o \bold{X}
-    \row    \o \l{QtUiTools}{Run-time form handling (QtUiTools)}  \o                  \o \bold{X}
-    \row    \o \l{Phonon Module}{Phonon Multimedia Framework}     \o                  \o \bold{X}
-    \row    \o \l{ActiveQt}                                       \o                  \o \bold{<X>}
-    \endtable
-
-    \bold{(X)} The Qt GUI Framework Edition contains selected classes from the QtGui and
-    Qt3Support modules corresponding to the functionality available in the Qt 3 Professional
-    Edition.
-
-    \bold{<X>} The ActiveQt module is only available on Windows.
-
-    Lists of the classes available in each edition are available on the
-    following pages:
-
-    \list
-    \o \l{Qt GUI Framework Edition}
-    \o \l{Qt Full Framework Edition}
-    \endlist
-
     Please see the \l{Supported Platforms}{list of supported
     platforms} for up-to-date information about the various platforms
     and compilers that Qt supports.
@@ -103,36 +61,13 @@
     \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
     for commercial editions of Qt and other Qt-related products.
 
-    To purchase, please visit the \l{How to Order}{online order
-    form}.
+    To purchase, please visit the \l{How to Order}{online order form}.
 
-    For further information and assistance, please contact Qt
-    sales.
+    For further information and assistance, please contact Qt sales.
 
     Web: http://qt.nokia.com/contact.
 
     Phone, U.S. office (for North America): \bold{1-650-813-1676}.
 
-    Phone, Norway office (for the rest of the world): \bold{+47 21 60
-    48 00}.
-*/
-
-/*!
-    \page full-framework-edition-classes.html
-    \title Qt Full Framework Edition
-    \ingroup classlists
-
-    \brief The list of Qt classes included in the Full Framework Edition.
-
-    \generatelist{classesbyedition Desktop}
-*/
-
-/*!
-    \page gui-framework-edition-classes.html
-    \title Qt GUI Framework Edition
-    \ingroup classlists
-
-    \brief The list of Qt classes included in the GUI Framework Edition.
-
-    \generatelist{classesbyedition DesktopLight}
+    Phone, Norway office (for the rest of the world): \bold{+47 21 60 48 00}.
 */