--with-cnid-db was now merged with --with-did. Document this.

diff --git a/doc/FAQ b/doc/FAQ
index 66cb77d4323c105068c44e8f04a6f27c1fe43e25..c886d5b6e747975413d39e454386fe052b0db621 100644 (file)
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,5 +1,5 @@
 Netatalk Frequently Asked Questions
-($Id: FAQ,v 1.6 2001-10-19 16:10:40 lancel Exp $)
+($Id: FAQ,v 1.7 2001-11-28 00:12:03 srittau Exp $)
 
 -----------------------------------------------------------------------------
 
@@ -55,7 +55,7 @@ Q29: I compiled Samba with the --with-netatalk flag. What did that do?
 Q30: What about the differences in naming schemes, and legal/illegal
      characters between Windows, Macs (and unix?)
 Q31: Where can I get the cnid-db (berkely db3) software? (needed for
-     --enable-cnid)
+     --with-did=cnid)
 Q32: What about security in Netatalk?
 
 
@@ -210,9 +210,8 @@ A:  Compile with the --with-did=last flag set. This activates a different
     method of calculating inodes in the software, and will hopefully fix some
     of these problems. This code, along with the CNID code, was still being
     worked out in Pre7. The cnid/db3 flags also go along with this:
-      --enable-cnid-db   use persistent cnid database per volume (EXPERIMENTAL)
       --with-db3=PATH         specify path to Berkeley DB3 installation
-      --with-did=[scheme]     set DID scheme (last,mtab) 
+      --with-did=[scheme]     set DID scheme (last,mtab,cnid) 
     
     (For more information on CNID, see the README.cnid file [may not exist yet], 
     into which I just copied wholesale Joe's comments on what he did with 
@@ -560,7 +559,7 @@ A:   Check out the documentation about the 'mswindows' flag in afpd.conf (?).
 
 
 Q31: Where can I get the cnid-db (berkely db3) software? (needed for
-     --enable-cnid)
+     --with-did=cnid)
 
 A:   First check to see if your unix has a port or package. If not, 
      http://www.sleepycat.com/download.html

diff --git a/doc/INSTALL b/doc/INSTALL
index aca7992a9e6a912003c09e1cec83d23b2ddbe97c..3b17b8cd2399fdb3764f2ca4b8d892c0461fadcc 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -101,18 +101,18 @@ a complete list.
 --enable-dropkludge: enable the experimental dropbox fix
        (INSECURE!),
 
---enable-cnid-db: use persistent cnid database per volume 
-       (EXPERIMENTAL),
-
 --with-db3=PATH: specify path to Berkeley DB3 installation,
 
---with-did=[scheme]: set DID scheme (last,mtab),
+--with-did=[scheme]: set DID scheme (last,mtab,cnid),
        The last DID scheme recreates version 37b behaviour where
        directory id's are incrementally calculated versus the new
        hash method. Unfortunately for machines that have a lot of
        devices, and/or a lot of inodes the hash can fail with
        multiple directories resolving to the same DID.
 
+       cnid is a new and experimental scheme using Berkeley DB3 files
+       to store a per-volume cnid database persistently.
+
 --with-msg-dir=path: path to message files [default=/etc/msg],
 
 --enable-srvloc: Turn on Server Location Protocol support (EXPERIMENTAL),