Merge branch 'v3-cleanup' into v3.1.6-alex

* v3-cleanup:
  autoconf: Indentation fixes
  Spelling fixes
  Whitespace and exclamation mark fixes

Conflicts:
	etc/afpd/main.c

diff --cc NEWS
Simple merge

diff --cc bin/uniconv/uniconv.c
Simple merge

diff --cc etc/afpd/auth.c
Simple merge

diff --cc etc/afpd/status.c
Simple merge

diff --cc etc/afpd/volume.c
Simple merge

diff --cc libatalk/cnid/cdb/cnid_cdb_close.c
Simple merge

diff --cc libatalk/cnid/cnid.c
Simple merge

diff --cc libatalk/cnid/dbd/cnid_dbd.c
index d4606400aa1539e6bd64bf52b24c410bfa1a3b9e,c96a22596163659fc87be4a6b3a60f3eafc6e321..09cf9ead2ed4f4cc10cf6f4458b8e85545afb7b8
--- 1/libatalk/cnid/dbd/cnid_dbd.c
--- 2/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@@ -487,10 -510,10 +487,10 @@@ cnid_dbd_open_fail
  /* ---------------------- */
  void cnid_dbd_close(struct _cnid_db *cdb)
  {
 -    CNID_private *db;
 +    CNID_bdb_private *db;
  
      if (!cdb) {
-         LOG(log_error, logtype_cnid, "cnid_close called with NULL argument !");
+         LOG(log_error, logtype_cnid, "cnid_close called with NULL argument!");
          return;
      }
  

diff --cc macros/netatalk.m4
Simple merge

diff --cc macros/quota-check.m4
Simple merge