Update the hcid.8 and hcid.conf.5 manual pages

2 files changed, 68 insertions, 3 deletions

diff --git a/hcid/hcid.8 b/hcid/hcid.8
index 2ef8ed31..767fc2ed 100644
--- a/hcid/hcid.8
+++ b/hcid/hcid.8
@@ -21,6 +21,9 @@ itself does not accept many command\-line options, as most of its
 configuration is done in the 
 .B hcid.conf
 file, which has its own man page.
+.B hcid
+can also provide a number of services via the D-BUS message bus
+system.
 .SH "OPTIONS"
 .TP 
 .B \-n
@@ -33,7 +36,57 @@ Use alternate configuration file instead of /etc/bluetooth/hcid.conf
 .I /etc/bluetooth/hcid.conf
 Default location of the global configuration file.
 
+.TP 
+.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/linkkeys
+Default location for link keys of paired devices. The directory
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
+is the address of the local device. The file is line separated, with
+the following columns separated by whitespace:
+
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP Remote device address.
+
+\fInnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn\fP Link key.
+
+\fIn\fP Link type integer.
+
+.TP 
+.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/names
+Default location for the device name cache. The directory
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
+is the address of the local device. The file is line separated, with
+the following columns separated by whitespace:
+
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP Remote device address.
+
+\fIname\fP Remote device name, terminated with newline.
+
+.TP 
+.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/features
+Default location for the features cache. The directory
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
+is the address of the local device. The file is line separated, with
+the following columns separated by whitespace:
+
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP Remote device address.
+
+\fInnnnnnnnnnnnnnnn\fP Remote device LMP features coded as an 8 byte bitfield.
+
+.TP 
+.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/manufacturers
+Default location for the manufacturers cache. The directory
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
+is the address of the local device. The file is line separated, with
+the following columns separated by whitespace:
+
+\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP Remote device address.
+
+\fIn\fP Remote device manufacturer integer.
+
+\fIn\fP Remote device LMP version integer.
+
+\fIn\fP Remote device LMP sub-version integer.
+
 .SH "SEE ALSO"
 \fBhcid.conf\fR(5)
 .SH "AUTHOR"
-This manual page was written by Philipp Matthias Hahn.
+This manual page was written by Philipp Matthias Hahn and Fredrik Noring.
diff --git a/hcid/hcid.conf.5 b/hcid/hcid.conf.5
index d110e2a7..a5d82417 100644
--- a/hcid/hcid.conf.5
+++ b/hcid/hcid.conf.5
@@ -58,11 +58,17 @@ Or, when no PIN is available:
 ERR
 
 .TP 
+\fBdbus_pin_helper\fP
+
+Declaring this parameter enables the D-BUS message bus system for PIN
+requests.
+
+.TP 
 \fBsecurity\fP  none|auto|user
 
 \fInone\fP means the security manager is disabled. \fIauto\fP uses
-local PIN for incoming connections. \fIuser\fP always asks the user
-for a PIN.
+local PIN, by default from /etc/bluetooth/pin, for incoming
+connections. \fIuser\fP always asks the user for a PIN.
 
 .SH "DEVICE SECTION"
 Parameters within a device section with no specifier, the default
@@ -230,5 +236,11 @@ You can check the Bluetooth specification version 1.2 Volume 2, Part B section 6
 .I /etc/bluetooth/hcid.conf
 Default location of the global configuration file.
 
+.TP 
+.I /etc/bluetooth/pin
+Default location of local PIN file, used for incoming connections in
+security mode \fIauto\fP. The file contains the PIN code terminated by
+newline.
+
 .SH "AUTHOR"
 This manual page was written by Edouard Lafargue, Fredrik Noring and Maxim Krasnyansky.