diff options
| author | Simon McVittie <smcv@debian.org> | 2014-09-15 12:55:54 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2014-09-15 12:55:54 +0100 |
| commit | 403920f796c3cbeca1bba58bda497da4770e7d0a (patch) | |
| tree | 22c59d2418690f68e169ff7500b22f92d410f55f /doc | |
| parent | d35dfa78f7ee90bebc3c8a290a7f5877feb7eb8b (diff) | |
| download | dbus-403920f796c3cbeca1bba58bda497da4770e7d0a.tar.gz | |
Imported Upstream version 1.8.8upstream/1.8.8
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.in | 3 | ||||
| -rw-r--r-- | doc/dbus-daemon.1.xml.in | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 89d952da..a48c7e5a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -210,7 +210,6 @@ DBUS_USER = @DBUS_USER@ DBUS_VERSION = @DBUS_VERSION@ DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ DBUS_X_LIBS = @DBUS_X_LIBS@ -DEFAULT_MESSAGE_UNIX_FDS = @DEFAULT_MESSAGE_UNIX_FDS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -667,8 +666,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@uninstall-local: @DBUS_DOXYGEN_DOCS_ENABLED_FALSE@install-data-local: +@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am 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 |