Merge branch 'master' into bloom

diff --combined adu.ggo
index 84187eb19b7f52667242f9e882fe22872103bb14,5da5908d7b9d7c467eac1044f0b3a75306028822..a180f1fc43e546e1d8c789cfb45678f01aeff0cc
--- 1/adu.ggo
--- 2/adu.ggo
+++ b/adu.ggo
@@@ -14,18 -14,6 +14,6 @@@ usage patterns of subdirectories and/o
  section "General options"
  #########################
  
- option "config-file" c
- #~~~~~~~~~~~~~~~~~~~~~
- "(default='~/.adurc')"
- string typestr="filename"
- optional
- details="
-       Options may be given at the command line or in the
-       configuration file. As usual, if an option is given both at
-       the command line and in the configuration file, the command
-       line option takes precedence.
- "
- 
  option "database-dir" d
  #~~~~~~~~~~~~~~~~~~~~~~
  "directory containing the osl tables"
@@@ -138,36 -126,6 +126,36 @@@ details=
        users. Decreasing the value causes adu to use slightly less memory.
  "
  
 +option "bloom-filter-order" B
 +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +"use bloom filters for hard link detection"
 +int typestr="order"
 +dependon="create"
 +default="23"
 +optional
 +details="
 +      Allocate bloom filters of size 2^order bits. Each regular
 +      file with hard link count greater than one is added to these
 +      filters which allows to detect hard links on a per-user basis.
 +      Greater values reduce the probability of false positives but
 +      require more memory.
 +
 +      Values less than 10 deactivate this feature so that no hard
 +      links are being detected.
 +"
 +
 +option "num-bloom-filter-hash-functions" N
 +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +"number of hash functions for the bloom filters"
 +int typestr="num"
 +dependon="create"
 +default="10"
 +optional
 +details="
 +      Cause each entry which is added to the bloom filter to set
 +      \"num\" bits of the bloom filter.
 +"
 +
  ##############################
  section "Options for --select"
  ##############################