summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlban Crequy <alban.crequy@collabora.co.uk>2008-10-22 15:52:02 -0400
committerAlban Crequy <alban.crequy@collabora.co.uk>2008-10-22 15:52:02 -0400
commitfce6ba1a6a5e36e5d201efc28dc4ff0ca0d87212 (patch)
treed2a8b1a824f0204d65318be9fe6390910832bc79 /docs
parentd7a3f9096cceccdab1c0c432b81e9159dbc9f204 (diff)
parentb74b5012b8762b13761b24f75f616043ff1220f9 (diff)
Merge branch 'master' into alban-xmpp-spec-tube-caps
Diffstat (limited to 'docs')
-rw-r--r--docs/.git-darcs-dir0
-rw-r--r--docs/telepathy-gabble.8.in3
-rw-r--r--docs/tubes.xml2
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/.git-darcs-dir b/docs/.git-darcs-dir
deleted file mode 100644
index e69de29bb..000000000
--- a/docs/.git-darcs-dir
+++ /dev/null
diff --git a/docs/telepathy-gabble.8.in b/docs/telepathy-gabble.8.in
index 6c6e95458..e00f75373 100644
--- a/docs/telepathy-gabble.8.in
+++ b/docs/telepathy-gabble.8.in
@@ -22,6 +22,9 @@ There are no command-line options.
.TP
\fBGABBLE_LOGFILE\fR=\fIfilename\fR
If set, debug output will go to the given file rather than to stderr.
+If \fB+\fR is prepended to the \fIfilename\fR (e.g.
+\fBGABBLE_LOGFILE=+gabble.log\fR), debug output will be appended
+to the file; otherwise, any existing file will be replaced.
.TP
\fBGABBLE_DEBUG\fR=\fItype\fR
May be set to "all" for full debug output, or various undocumented options
diff --git a/docs/tubes.xml b/docs/tubes.xml
index df3ca5e7a..4dabe9981 100644
--- a/docs/tubes.xml
+++ b/docs/tubes.xml
@@ -762,7 +762,7 @@
decimal integer. This corresponds to xs:unsignedInt in XML
Schema Part 2.</li>
<li>"int": A signed integer representable in 32 bits using two's
- complement. The corresponding D-Bus signature is 'i' or 'h' on input,
+ complement. The corresponding D-Bus signature is 'i' or 'n' on input,
'i' on output, and the element's character content is an ASCII
decimal integer, possibly starting with '-' or '+'. This corresponds
to xs:int in XML Schema Part 2.</li>