diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-29 18:05:32 +0100 |
|---|---|---|
| committer | Andrew Christian <andrew.christian@nokia.com> | 2012-02-29 18:06:35 +0100 |
| commit | 10c41cb849ab8f715a04e35c6cc702a294f82eba (patch) | |
| tree | 33ff6ad9cfdf30f2b9e72d47fa1f58acafaa1d74 | |
| parent | 5676398dc87098026d89e4ce09ac5fe5e9a81fec (diff) | |
Add compatibility for older qdocconf
Change-Id: I0059888556aba817d619c2465c4f19c9cb4a6533
Reviewed-by: Andrew Christian <andrew.christian@nokia.com>
| -rw-r--r-- | doc/jsonstream.qdocconf | 2 | ||||
| -rw-r--r-- | doc/src/index.qdoc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/jsonstream.qdocconf b/doc/jsonstream.qdocconf index a1746e0..ac39078 100644 --- a/doc/jsonstream.qdocconf +++ b/doc/jsonstream.qdocconf @@ -1,3 +1,5 @@ +alias.i = e + project = JsonStream description = JSONStream Manager Documentation diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 81f8334..c928256 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -58,16 +58,16 @@ line to your .pro file. Conceptually, the JSON Stream classes are divided into a generic client (JsonClient), a generic server (JsonServer), a stream transport shared by the client and the server (JsonStream), and an optional authentication agent (JsonAuthority) which can be installed on the server. -Each connection to the JsonServer is given a unique \i{identifier} so that the different +Each connection to the JsonServer is given a unique \e{identifier} so that the different connections can be disambiguated. \image classes.png When a new socket connection is opened to the server, the authentication agent "absorbs" all communication over that socket until the connection has been properly authenticated. -The authentication agent is also responsible for setting the \i{identifier} of the connection. +The authentication agent is also responsible for setting the \e{identifier} of the connection. For example, an authentication agent that matches the process ID (PID) of the connecting -client to an appropriate user and permission writes may set the \i{identifier} of the +client to an appropriate user and permission writes may set the \e{identifier} of the connection to the Unix name of the UID of the connecting process. \section2 C++ API |