summaryrefslogtreecommitdiffstats
path: root/doc/src/frameworks-technologies
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-08-10 11:33:38 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-08-10 11:33:38 (GMT)
commitbc7a42be16c5218ba5022c95bf1334a15a9151a6 (patch)
treee1ba650a2e030ba64cd4e45e66fbe5e4a0e00e2a /doc/src/frameworks-technologies
parent834907be1ebea35ac933ef2fe48658b983057820 (diff)
downloadQt-bc7a42be16c5218ba5022c95bf1334a15a9151a6.zip
Qt-bc7a42be16c5218ba5022c95bf1334a15a9151a6.tar.gz
Qt-bc7a42be16c5218ba5022c95bf1334a15a9151a6.tar.bz2
doc: Some reorganization of top page topic hierarchy.
Diffstat (limited to 'doc/src/frameworks-technologies')
-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
3 files changed, 7 insertions, 9 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)