QDoc: Remove references to DITA in documentation

As most of the code related to generating DITA has been pulled out,
remove also the references to it in the documentation.

Change-Id: I420242f236faf3b89baea1547421a1f50d91762f
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>

5 files changed, 8 insertions, 346 deletions

diff --git a/src/qdoc/doc/qa-pages.qdoc b/src/qdoc/doc/qa-pages.qdoc
index 5602ba3e0..c69b1cdc6 100644
--- a/src/qdoc/doc/qa-pages.qdoc
+++ b/src/qdoc/doc/qa-pages.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page 28-qdoc-qa-pages.html
-    \previouspage Generating DITA XML Output
+    \previouspage The QDoc Configuration File
     \contentspage QDoc Manual
     \nextpage QDoc Manual
 
diff --git a/src/qdoc/doc/qdoc-manual-DITA.qdoc b/src/qdoc/doc/qdoc-manual-DITA.qdoc
deleted file mode 100644
index 116082628..000000000
--- a/src/qdoc/doc/qdoc-manual-DITA.qdoc
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page 21-0-qdoc-creating-dita-maps.html
-    \previouspage Miscellaneous
-    \contentspage QDoc Manual
-    \nextpage The QDoc Configuration File
-
-    \title Creating DITA Maps
-
-    You can create DITA map files using three new qdoc commands, the \l{ditamap-command}
-    {ditamap} command, the \l{topicref-command} {topicref} command, and the \l{mapref-command}
-    {mapref} command. How these DITA maps will be used automatically or manually by the
-    documentation build process is still under consideration. This section will be updated
-    as the decisions are made.
-
-    \section1 What is a DITA Map?
-
-    A complete description of DITA can be found at the
-    \l{http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=dita}
-    {OASIS Darwin Information Typing Architecture} site.
-
-    An explanation of the DITA map is found at that site
-    \l{http://docs.oasis-open.org/dita/v1.2/os/spec/langref/map.html}{here}.
-
-    \target ditamap-command
-    \section1 \\ditamap
-
-    The \\ditamap command is for creating a DITA map using qdoc commands.
-    The \\ditamap command is a kind of \\page command that produces a
-    \e{.ditamap} instead of a \e{.html} or \e{.xml} file. The file that
-    is created actually contains XML text, but the \e{.ditamap} suffix is
-    used to identify the file as containing a DITA MAP.
-
-    The argument is the name of the file to be created. In the following
-    example, the file \e{creator.ditamap} is output:
-    \code
-      \ditamap creator.ditamap
-    \endcode
-
-    \target topicref-command
-    \section1 \\topicref \\endtopicref
-
-    The \\topicref \\endtopicref commands are for creating a topicref
-    in the ditamap. The \\endtopicref command is required because
-    \\topicref commands can be nested.
-
-    \\topicref has two arguments. The first argument becomes the value
-    of the \e navtitle attribute. Normally, you use the title of the
-    topic being referenced. This title is often what will appear in a
-    table of contents constructed from the ditamap.
-
-    The second argument is the name of the page being referenced. The
-    second argument is actually optional, for example if you are using
-    a topicref as a container for other topicrefs and maprefs. It is
-    also optional if you want qdoc to find the page name for you by
-    looking up the title in its internal data structure. It is recommended
-    that you provide the second parameter if you know the page name.
-
-    \code
-      \topicref {QML Module QtQuick 2} {qtquick-2.xml}
-        \mapref {Creator Manual} {creator-manual.ditamap} \endmapref
-        \topicref {QML Mouse Events} {qtquick2-mouseevents.xml} \endtopicref
-        \topicref {Property Binding} {qtquick2-propertybinding.xml} \endtopicref
-      \endtopicref
-    \endcode
-
-    \target mapref-command
-    \section1 \\mapref
-
-    The \\mapref command is for creating a mapref in the ditamap. A
-    mapref refers to another ditamap, which you want to include in
-    your ditamap. Like the \\topicref command, the \\mapref command
-    has two arguments, but for the \\mapref command, both arguments
-    are required. The arguments are essentially the same as described
-    for \\topicref, but for \\mapref, the second command must be the
-    name of another ditamap, i.e. it must have the \e{.ditamap}
-    suffix. You must provide the file name. qdoc can't look up the
-    file name for you.
-
-    \code
-        \mapref {Creator Manual} {creator-manual.ditamap} \endmapref
-    \endcode
-
-    \section1 An Example Ditamap Page
-
-    The following example uses the three qdoc ditamap commands described above.
-
-    \code
-      \ditamap creator.ditamap
-      \title The DITA Map for Creator
-
-      \topicref {QML Module QtQuick 1}
-        \topicref {QML Mouse Events} \endtopicref
-        \topicref {Property Binding} \endtopicref
-      \endtopicref
-
-      \topicref {QML Module QtQuick 2} {qtquick-2.xml}
-        \mapref {Creator Manual} {creator-manual.ditamap} \endmapref
-        \topicref {QML Mouse Events} {qtquick2-mouseevents.xml} \endtopicref
-        \topicref {Property Binding} {qtquick2-propertybinding.xml} \endtopicref
-      \endtopicref
-
-      \topicref {QML Module QtQuick.Particles 2} {qtquick-particles-2.xml}
-        \topicref {Age} {qml-qtquick-particles2-age.xml} \endtopicref
-      \endtopicref
-    \endcode
-
-    \section1 The Resulting Ditamap File
-
-    This is the \e{.ditamap} file you get when you input the qdoc
-    ditamap page shown above. Note that you can write ditamap files
-    directly in XML just as easily as you can write them using the
-    qdoc commands. The choice is yours.
-
-    \code
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">
-      <map>
-        <topicmeta>
-          <shortdesc>The DITA Map for Creator</shortdesc>
-        </topicmeta>
-        <topicref navtitle="QML Module QtQuick 1" href="qtquick-1.xml">
-          <topicref navtitle="QML Mouse Events" href="qtquick2-mouseevents.xml"/>
-          <topicref navtitle="Property Binding" href="qtquick2-propertybinding.xml"/>
-        </topicref>
-        <topicref navtitle="QML Module QtQuick 2" href="qtquick-2.xml">
-          <mapref navtitle="Creator Manual" href="creator-manual.ditamap"/>
-          <topicref navtitle="QML Mouse Events" href="qtquick2-mouseevents.xml"/>
-          <topicref navtitle="Property Binding" href="qtquick2-propertybinding.xml"/>
-        </topicref>
-        <topicref navtitle="QML Module QtQuick.Particles 2" href="qtquick-particles-2.xml">
-          <topicref navtitle="Age" href="qml-qtquick-particles2-age.xml"/>
-        </topicref>
-      </map>
-    \endcode
-
-*/
-
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
index 9c11fdd49..c21869ac6 100644
--- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -240,21 +240,6 @@
        }
     \endcode
 
-    If qdoc is generating DITA XML, it will translate the commands to:
-
-    \code
-        <sectiondiv outputclass="float-right">
-            <p>
-                <fig>
-                    <image href="images/qml-column.png" placement="inline"/>
-                </fig>
-            </p>
-        </sectiondiv>
-    \endcode
-
-    Your DITA XML publishing program must then recognize the \e
-    {outputclass} attribute value.
-
     \note Note that the \b {\\div} command can be nested.
 
     Below you can find an example taken from the index.qdoc file used to
@@ -320,53 +305,6 @@
             \enddiv
           \enddiv
 
-    When generating DITA XML, qdoc outputs the nested \e {div} commands as:
-
-    \code
-      <sectiondiv outputclass="indexbox guide">
-          <sectiondiv outputclass="heading">
-              <p>Qt Developer Guide</p>
-          </sectiondiv>
-          <sectiondiv outputclass="indexboxcont indexboxbar">
-              <sectiondiv outputclass="section indexIcon"/>
-              <sectiondiv outputclass="section">
-                  <p>Qt is a cross-platform application and UI
-                     framework. Using Qt, you can write
-                     web-enabled applications once and deploy
-                     them across desktop, mobile and embedded
-                     operating systems without rewriting the
-                     source code.
-                  </p>
-              </sectiondiv>
-              <sectiondiv outputclass="section sectionlist">
-                  <ul>
-                      <li>
-                          <xref href="gettingstarted.xml#id-606ee7a8-219b-47b7-8f94-91bc8c76e54c">Getting started</xref>
-                      </li>
-                      <li>
-                          <xref href="installation.xml#id-075c20e2-aa1e-4f88-a316-a46517e50443">Installation</xref>
-                      </li>
-                      <li>
-                          <xref href="how-to-learn-qt.xml#id-49f509b5-52f9-4cd9-9921-74217b9a5182">How to learn Qt</xref>
-                      </li>
-                      <li>
-                          <xref href="tutorials.xml#id-a737f955-a904-455f-b4aa-0dc69ed5a64f">Tutorials</xref>
-                      </li>
-                      <li>
-                          <xref href="all-examples.xml#id-98d95159-d65b-4706-b08f-13d80080448d">Examples</xref>
-                      </li>
-                      <li>
-                          <xref href="qt4-7-intro.xml#id-519ae0e3-4242-4c2a-b2be-e05d1e95f177">What's new in Qt 4.7</xref>
-                      </li>
-                  </ul>
-              </sectiondiv>
-          </sectiondiv>
-      </sectiondiv>
-    \endcode
-
-    Your DITA XML publishing program must recognize the values of the
-    \e {outputclass} attribute.
-
     See also \l {span-command} {\\span}.
 
     \target span-command
@@ -640,7 +578,6 @@
 
     The \\uicontrol command is used to mark content as being used for UI
     control elements. When using HTML, the output is rendered in bold.
-    When using DITA XML the content is enclosed in a \c{uicontrol} tag.
 
     \sa \\b
 
@@ -2837,13 +2774,6 @@
            * /
            \endcode
 
-    \note This doesn't work in DITA XML, so don't use it because it
-    produces a DITA XML file that doesn't validate. There probably is
-    a way to do this in DITA, so if we figure it out, we will put it
-    in. But this capability is not used anywhere other than right
-    here, so it probably isn't important. For now, if you use this
-    option, qdoc will ignore it and produce a list without it.
-
     QDoc renders this as:
 
            \list G
@@ -3363,7 +3293,7 @@
     \page 12-0-qdoc-commands-miscellaneous.html
     \previouspage Special Content
     \contentspage QDoc Manual
-    \nextpage Creating DITA Maps
+    \nextpage The QDoc Configuration File
 
     \title Miscellaneous
 
@@ -3799,8 +3729,7 @@
     \target meta-command
     \section1 \\meta
 
-    The \\meta command is mainly used for including metadata in DITA
-    XML files. It is also used for adding metadata to example documentation,
+    The \\meta command is used for adding metadata to example documentation,
     and when generating HTML output for specifying the \e maintainer(s) of a
     C++ class.
 
@@ -3826,46 +3755,7 @@
     \endcode
 
     When running QDoc to generate HTML, the example above will have no
-    effect on the generated output, but if you run QDoc to generate
-    DITA XML, the example will generate the following:
-
-    \code
-    <?xml version="1.0" encoding="UTF-8"?>
-    <!DOCTYPE cxxClass PUBLIC "-//NOKIA//DTD DITA C++ API Class Reference Type v0.6.0//EN" "dtd/cxxClass.dtd">
-    <!--qwidget.cpp-->
-    <cxxClass id="id-9a14268e-6b09-4eee-b940-21a00a0961df">
-       <apiName>QWidget</apiName>
-       <shortdesc>the QWidget class is the base class of all user interface objects.</shortdesc>
-       <prolog>
-           <author>Qt Development Frameworks</author>
-           <publisher>Qt Project</publisher>
-           <copyright>
-               <copyryear year="2020"/>
-               <copyrholder>Qt Project</copyrholder>
-           </copyright>
-           <permissions view="all"/>
-           <metadata>
-               <audience type="designer"/>
-               <audience type="programmer"/>
-               <audience type="user"/>
-               <category>Class reference</category>
-               <prodinfo>
-                   <prodname>Qt Reference Documentation</prodname>
-                   <vrmlist>
-                       <vrm version="4" release="7" modification="3"/>
-                   </vrmlist>
-                   <component>QtGui</component>
-               </prodinfo>
-               <othermeta name="platform" content="MeeGo"/>
-               <othermeta name="platform" content="macOS 10.6"/>
-               <othermeta name="technology" content="User Interface"/>
-           </metadata>
-       </prolog>
-    \endcode
-
-    In the example output, several values have been set using default
-    values obtained from the QDoc configuration file. See \l
-    {Generating DITA XML Output} for details.
+    effect on the generated output.
 
     \b {Example Metadata}
 
@@ -3968,8 +3858,7 @@
     The \\raw command and the corresponding
     \\endraw command delimit a block of raw mark-up language code.
 
-    \note Avoid using this command if possible, because it generates
-    DITA XML code that causes problems. If you are trying to generate
+    \note Avoid using this command if possible. If you are trying to generate
     special table or list behavior, try to get the behavior you want
     using the \l {span-command} {\\span} and \l {div-command} {\\div}
     commands in your \l {table-command} {\\table} or \l {list-command}
diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
index 98a84fe26..070263e12 100644
--- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page 21-0-qdoc-configuration.html
-    \previouspage Creating DITA Maps
+    \previouspage Miscellaneous
     \contentspage QDoc Manual
     \nextpage Generic Configuration Variables
 
@@ -821,9 +821,7 @@
 
     A macro variable can be restricted for use in one type of output
     generation. By appending \c {.HTML} to the macro name, for
-    example, the macro is only used when generating HTML output. By
-    appending \c {.DITAXML} to the macro name, the macro is only used
-    when generating DITA XML.
+    example, the macro is only used when generating HTML output.
 
     \badcode
         macro.gui              = "\\b"
@@ -1951,71 +1949,12 @@
     another tag is applied to all examples by using just \c {*} as the
     match string.
 */
-/*!
-    \page 21-3-qt-dita-xml-output.html
-    \previouspage minimum.qdocconf
-    \contentspage QDoc Manual
-    \nextpage QA Pages
-
-    \title Generating DITA XML Output
-
-    QDoc can generate \l {http://dita.xml.org} {DITA XML output}.
-
-    In your configuration file, set your \c {outputformats} variable
-    to \c {DITAXML}, and send the output to an appropriate directory:
-
-    \badcode
-    outputdir                  = $QTDIR/doc/ditaxml
-    outputformats              = DITAXML
-    \endcode
-
-    And include these macros in your configuration file to prevent
-    QDoc from doing some escaping that doesn't validate in XML:
-
-    \badcode
-    macro.aacute.DITAXML       = "&aacute;"
-    macro.Aring.DITAXML        = "&Aring;"
-    macro.aring.DITAXML        = "&aring;"
-    macro.Auml.DITAXML         = "&Auml;"
-    macro.br.DITAXML           = " "
-    macro.BR.DITAXML           = " "
-    macro.copyright.DITAXML    = "&copy;"
-    macro.eacute.DITAXML       = "&eacute;"
-    macro.hr.DITAXML           = " "
-    macro.iacute.DITAXML       = "&iacute;"
-    macro.oslash.DITAXML       = "&oslash;"
-    macro.ouml.DITAXML         = "&ouml;"
-    macro.raisedaster.DITAXML  = "<sup>*</sup>"
-    macro.rarrow.DITAXML       = "&rarr;"
-    macro.reg.DITAXML          = "<sup>&reg;</sup>"
-    macro.uuml.DITAXML         = "&uuml;"
-    macro.mdash.DITAXML        = "&mdash;"
-    macro.emptyspan.DITAXML    = " "
-    \endcode
-
-    You can also set default values for some of the tags in the DITA
-    \c {<prolog>} and \c {<metadata>} elements:
-
-    \badcode
-    dita.metadata.default.author      = Qt Development Frameworks
-    dita.metadata.default.permissions = all
-    dita.metadata.default.publisher   = Qt Project
-    dita.metadata.default.copyryear = 2020
-    dita.metadata.default.copyrholder = Qt Project
-    dita.metadata.default.audience = programmer
-    \endcode
-
-    See the \l {meta-command}
-    {\\meta} command for more details on DITA metadata.
-
-*/
-
 
 /*!
     \page 21-1-minimum-qdocconf.html
     \previouspage qtgui.qdocconf
     \contentspage QDoc Manual
-    \nextpage Generating DITA XML Output
+    \nextpage The QDoc Configuration File
 
     \title minimum.qdocconf
 
diff --git a/src/qdoc/doc/qdoc-manual.qdoc b/src/qdoc/doc/qdoc-manual.qdoc
index 716f8c73f..a03fe91ff 100644
--- a/src/qdoc/doc/qdoc-manual.qdoc
+++ b/src/qdoc/doc/qdoc-manual.qdoc
@@ -57,7 +57,6 @@
           \li \l {Special Content}
           \li \l {Miscellaneous}
         \endlist
-      \li \l{Creating DITA Maps}
       \li \l {The QDoc Configuration File}
         \list
           \li \l {Generic Configuration Variables}
@@ -68,7 +67,6 @@
           \li \l {Example Manifest Files}
           \li \l {qtgui.qdocconf}
           \li \l {minimum.qdocconf}
-          \li \l {Generating DITA XML Output}
         \endlist
       \li \l {QA Pages}
     \endlist