summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-01 08:52:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-01 08:52:33 (GMT)
commita6044059d3bb6a1f3f319c3f07e75b2e4258a56f (patch)
treec7ec0fe1e99be79f5f22339f7b2ea15aa6c0005d /doc
parent75121229e20361eefb2655932033bdbb557df433 (diff)
parent5822db01277a19d8424b1f0d55868a82c8e719e6 (diff)
downloadQt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.zip
Qt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.tar.gz
Qt-a6044059d3bb6a1f3f319c3f07e75b2e4258a56f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix two minor doc errors
Diffstat (limited to 'doc')
-rw-r--r--doc/src/platforms/emb-envvars.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/emb-envvars.qdoc b/doc/src/platforms/emb-envvars.qdoc
index 1d109b4..3f318eb 100644
--- a/doc/src/platforms/emb-envvars.qdoc
+++ b/doc/src/platforms/emb-envvars.qdoc
@@ -112,7 +112,7 @@
device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for
touch panels.
- Multiple keyboard drivers can be specified in one go:
+ Multiple mouse drivers can be specified in one go:
\snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3