summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/frameworks-technologies/dbus-adaptors.qdoc1
-rw-r--r--doc/src/frameworks-technologies/dbus-intro.qdoc2
-rw-r--r--doc/src/frameworks-technologies/ipc.qdoc13
-rw-r--r--doc/src/modules.qdoc7
-rw-r--r--doc/src/xml-processing/xml-patterns.qdoc2
-rw-r--r--doc/src/xml-processing/xml-processing.qdoc8
-rw-r--r--doc/src/xml-processing/xquery-introduction.qdoc2
7 files changed, 17 insertions, 18 deletions
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 181a8d9..f193a67 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -30,7 +30,6 @@
\title Using QtDBus Adaptors
\brief How to create and use DBus adaptors in Qt.
- \ingroup technology-apis
\ingroup best-practices
Adaptors are special classes that are attached to any QObject-derived class
diff --git a/doc/src/frameworks-technologies/dbus-intro.qdoc b/doc/src/frameworks-technologies/dbus-intro.qdoc
index bccb6da..9d4cd95 100644
--- a/doc/src/frameworks-technologies/dbus-intro.qdoc
+++ b/doc/src/frameworks-technologies/dbus-intro.qdoc
@@ -27,7 +27,7 @@
/*!
\page intro-to-dbus.html
- \title Introduction to D-Bus
+ \title D-Bus
\brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus.
\keyword QtDBus
diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc
index 23234ae..26a8cec 100644
--- a/doc/src/frameworks-technologies/ipc.qdoc
+++ b/doc/src/frameworks-technologies/ipc.qdoc
@@ -56,13 +56,12 @@
\section1 D-Bus
- The \l{QtDBus} module is a Unix-only library
- you can use to implement IPC using the D-Bus protocol. It extends
- Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the
- IPC level, allowing a signal emitted by one process to be
- connected to a slot in another process. This \l {Introduction to
- D-Bus} page has detailed information on how to use the \l{QtDBus}
- module.
+ The \l{QtDBus} module is a Unix-only library you can use to
+ implement IPC using the D-Bus protocol. It extends Qt's
+ \l{signalsandslots.html} {Signals and Slots} mechanism to the IPC
+ level, allowing a signal emitted by one process to be connected to
+ a slot in another process. This \l {D-Bus} page has detailed
+ information on how to use the \l{QtDBus} module.
\section1 Qt COmmunications Protocol (QCOP)
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index c35d71c..941459b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -442,7 +442,7 @@
\section1 Further Reading
General overviews of XQuery and XSchema can be found in the
- \l{Using XML Technologies} document.
+ \l{XQuery} document.
An introduction to the XQuery language can be found in
\l{A Short Path to XQuery}.
@@ -842,8 +842,7 @@
\target The QDBus compiler
\brief The QtDBus module is a Unix-only library that you can use
- to perform Inter-Process Communication using the \l{Introduction to
- D-Bus}{D-Bus} protocol.
+ to perform Inter-Process Communication using the \l{D-Bus} protocol.
Applications using the QtDBus module can provide services to
other, remote applications by exporting objects, as well as use
@@ -869,7 +868,7 @@
directory. When installing Qt from source, this module is built when Qt's
tools are built.
- See the \l {Introduction to D-Bus} page for detailed information on
+ See the \l {D-Bus} page for detailed information on
how to use this module.
This module is part of all \l{Qt editions}.
diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc
index dcf92f6..d0c8709 100644
--- a/doc/src/xml-processing/xml-patterns.qdoc
+++ b/doc/src/xml-processing/xml-patterns.qdoc
@@ -27,7 +27,7 @@
/*!
\page xmlprocessing.html
- \title Using XML Technologies
+ \title XQuery
\previouspage Working with the DOM Tree
\contentspage XML Processing
diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc
index 0d58301..dcdd8d1 100644
--- a/doc/src/xml-processing/xml-processing.qdoc
+++ b/doc/src/xml-processing/xml-processing.qdoc
@@ -32,13 +32,15 @@
\brief Classes that support XML, via, for example DOM and SAX.
These classes are relevant to XML users.
-
+
\generatelist{related}
*/
/*!
\page xml-processing.html
\title XML Processing
+ \ingroup technology-apis
+
\brief An Overview of the XML processing facilities in Qt.
In addition to core XML support, classes for higher level querying
@@ -57,7 +59,7 @@
\o \l {XML Streaming}
\o \l {The SAX Interface}
\o \l {Working with the DOM Tree}
- \o \l {Using XML Technologies}{XQuery/XPath and XML Schema}
+ \o \l {XQuery}{XQuery/XPath and XML Schema}
\list
\o \l{A Short Path to XQuery}
\endlist
@@ -525,7 +527,7 @@
\previouspage The SAX Interface
\contentspage XML Processing
- \nextpage {Using XML Technologies}{XQuery/XPath and XML Schema}
+ \nextpage {XQuery}{XQuery/XPath and XML Schema}
DOM Level 2 is a W3C Recommendation for XML interfaces that maps the
constituents of an XML document to a tree structure. The specification
diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc
index 09af688..b79c205 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/doc/src/xml-processing/xquery-introduction.qdoc
@@ -29,7 +29,7 @@
\page xquery-introduction.html
\title A Short Path to XQuery
-\startpage Using XML Technologies
+\startpage XQuery
\target XQuery-introduction
XQuery is a language for querying XML data or non-XML data that can be