summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2009-07-23 14:56:05 (GMT)
committerRobert Griebl <rgriebl@trolltech.com>2009-07-23 14:56:48 (GMT)
commit6ac3cbc61a1fc80df0bac755028037586f1fdc3d (patch)
tree3de62c43c4dbd5bf28cf8474594aff97e1cc6c9f /doc
parentc36139c665e61866aff4bf8572890a735167a7d0 (diff)
downloadQt-6ac3cbc61a1fc80df0bac755028037586f1fdc3d.zip
Qt-6ac3cbc61a1fc80df0bac755028037586f1fdc3d.tar.gz
Qt-6ac3cbc61a1fc80df0bac755028037586f1fdc3d.tar.bz2
Some minor doc fixes.
Reviewed-by: Kavindra
Diffstat (limited to 'doc')
-rw-r--r--doc/src/emb-charinput.qdoc14
-rw-r--r--doc/src/emb-kmap2qmap.qdoc2
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/emb-charinput.qdoc b/doc/src/emb-charinput.qdoc
index 565d953..dc4eed5 100644
--- a/doc/src/emb-charinput.qdoc
+++ b/doc/src/emb-charinput.qdoc
@@ -108,7 +108,7 @@
\section1 Keymaps
Starting with 4.6, \l {Qt for Embedded Linux} has gained support for
- user defined keymaps. Keymap handling is supported by the builtin
+ user defined keymaps. Keymap handling is supported by the built-in
keyboard drivers \c TTY and \c LinuxInput. Custom keyboard drivers can
use the existing keymap handling code via
QWSKeyboardHandler::processKeycode().
@@ -124,7 +124,7 @@
\snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 2
- The \c <driver> argument are \c TTY, \c LinuxInput and \l
+ The \c <driver> arguments are \c TTY, \c LinuxInput and \l
{QKbdDriverPlugin::keys()}{keys} identifying custom drivers, and the
driver specific options are typically a device, e.g., \c /dev/tty0.
@@ -142,17 +142,17 @@
\row \o \c /dev/xxx \o
Open the specified device, instead of the driver's default device.
\row \o \c repeat-delay=<d> \o
- Time in milliseconds until auto-repeat kicks in.
+ Time (in milliseconds) until auto-repeat kicks in.
\row \o \c repeat-rate=<r> \o
- Time in milliseconds specifying interval between auto-repeats.
+ Time (in milliseconds) specifying the interval between auto-repeats.
\row \o \c keymap=xx.qmap \o
File name of a keymap file in Qt's \c qmap format. See \l {kmap2qmap}
- for instructions on how to create thoes files.\br Please note that the
- file name can of course also be the name of a QResource.
+ for instructions on how to create thoes files.\br Note that the file
+ name can of course also be the name of a QResource.
\row \o \c disable-zap \o
Disable the QWS server "Zap" shortcut \bold{Ctrl+Alt+Backspace}
\row \o \c enable-compose \o
- Activate Latin-1 composing features in the builtin US keymap. You can
+ Activate Latin-1 composing features in the built-in US keymap. You can
use the right \c AltGr or right \c Alt is used as a dead key modifier,
while \c AltGr+. is the compose key. For example:
\list
diff --git a/doc/src/emb-kmap2qmap.qdoc b/doc/src/emb-kmap2qmap.qdoc
index 2b3f687..19d33c1 100644
--- a/doc/src/emb-kmap2qmap.qdoc
+++ b/doc/src/emb-kmap2qmap.qdoc
@@ -66,7 +66,7 @@
kmap2qmap i386/qwertz/de-latin1-nodeadkeys.kmap include/compose.latin1.inc de-latin1-nodeadkeys.qmap
\endcode
- \c kmap2qmap doesn't support all the (pseudo) symbols that the Linux
+ \c kmap2qmap does not support all the (pseudo) symbols that the Linux
kernel supports. If you are converting a standard keymap you will get a
lot of warnings for things like \c Show_Registers, \c Hex_A, etc.: you
can safely ignore those.