summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-03-26 17:14:57 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-03-26 17:14:57 (GMT)
commit0c525f9a973d64ef9392b74a59aabe9129d5e62c (patch)
tree9607b23226fad7c33cdd8e2fdad6528a1d0a3252 /doc
parent3f0da69e3654db1075096e072df1f060f3a31b77 (diff)
downloadQt-0c525f9a973d64ef9392b74a59aabe9129d5e62c.zip
Qt-0c525f9a973d64ef9392b74a59aabe9129d5e62c.tar.gz
Qt-0c525f9a973d64ef9392b74a59aabe9129d5e62c.tar.bz2
Squashed commit of the following:
commit d30c39ccaa52ae61d798ca38af065c0a2ad96941 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:01:59 2009 +0100 Doc: Fixed a link to a function and added another reference to the Phonon overview. Reviewed-by: TrustMe
Diffstat (limited to 'doc')
-rw-r--r--doc/src/phonon-api.qdoc2
-rw-r--r--doc/src/phonon.qdoc3
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index 01f7c8a..147ded3 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -2656,7 +2656,7 @@
To find out what \l{Phonon::}{AudioOutputDevice}s are available
for AudioOutput, you can call
- BackendCapabilities::availableAudioDevices(). A default device is
+ BackendCapabilities::availableAudioOutputDevices(). A default device is
selected by the backend, but it is possible to set the device to
be used with setOutputDevice(). The outputDeviceChanged() signal
will be emitted if the device changes.
diff --git a/doc/src/phonon.qdoc b/doc/src/phonon.qdoc
index e86ccf6..fa84b96 100644
--- a/doc/src/phonon.qdoc
+++ b/doc/src/phonon.qdoc
@@ -566,7 +566,8 @@
framework, but rather use exchangeable backends to do the work.
See the \l{Phonon Module} page for general information about the
- framework.
+ framework and the \l{Phonon Overview} for an introductory tour of its
+ features.
*/
/*!