diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
| commit | 1909a82a8a871781f9a488881944912c7cc367e6 (patch) | |
| tree | b06581f13abfc573246a0a6a2c3d253cbe993151 /doc | |
| parent | eca7a1c5e0b2fbb4edee3aa3965d2eec451bd66b (diff) | |
| parent | 8874d3a0c57c0cae97cbe426e3686936da53f649 (diff) | |
| download | dbus-1909a82a8a871781f9a488881944912c7cc367e6.tar.gz dbus-1909a82a8a871781f9a488881944912c7cc367e6.tar.bz2 dbus-1909a82a8a871781f9a488881944912c7cc367e6.zip | |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dbus-daemon.1.xml.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/dbus-daemon.1.xml.in b/doc/dbus-daemon.1.xml.in index 7b7f4a1b..cd7942c3 100644 --- a/doc/dbus-daemon.1.xml.in +++ b/doc/dbus-daemon.1.xml.in @@ -528,6 +528,10 @@ Available limit names are:</para> "auth_timeout" : milliseconds (thousandths) a connection is given to authenticate + "pending_fd_timeout" : milliseconds (thousandths) a + fd is given to be transmitted to + dbus-daemon before disconnecting the + connection "max_completed_connections" : max number of authenticated connections "max_incomplete_connections" : max number of unauthenticated connections |