afpd.conf.tmpl: Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'

diff --combined config/afpd.conf.tmpl
index 377592120173b11d26a6d580bf016042fa5f9c19,a6c3d6ca6a8e0e7878f4088bb8ebecbbd3aeec78..0994a116d4821f1f2475fac5ccd889e1451e20db
--- 1/config/afpd.conf.tmpl
--- 2/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@@ -1,7 -1,8 +1,8 @@@
  #
  # CONFIGURATION FOR AFPD
  #
- # Each line defines a virtual server that should be available.
+ # Each single line defines a virtual server that should be available.
+ # Though, using "\" character, newline escaping is supported.
  # Empty lines and lines beginning with `#' are ignored.
  # Options in this file will override both compiled-in defaults
  # and command line options.
@@@ -10,7 -11,7 +11,7 @@@
  
  #
  # Format:
- #  - [options]                      to specify options for the default server
+ #  - [options]               to specify options for the default server
  #  "Server name" [options]   to specify an additional server
  #
  
@@@ -69,8 -70,6 +70,8 @@@
  #                         string.
  #     -slp                Register this server with the Service Location
  #                         Protocol (if SLP support was compiled in).
 +#     -nozeroconf         Don't register this server with the Multicats
 +#                         DNS Protocol.
  #     -advertise_ssh      Allows Mac OS X clients (10.3.3-10.4) to
  #                         automagically establish a tunneled AFP connection
  #                         through SSH. This option is not so significant
@@@ -274,16 -273,19 +275,19 @@@
  #       4 servers w/ names server1-3 and one w/ the hostname. servers
  #       1-3 get routed to different ports with server 3 being bound 
  #       specifically to address 192.168.1.3
+ #
  #           -
  #           server1 -port 12000
  #           server2 -port 12001
  #           server3 -port 12002 -ipaddr 192.168.1.3
  #
  #       a dedicated guest server, a user server, and a special
- #       ddp-only server:
- #           "Guest Volume" -uamlist uams_guest.so -loginmesg "Welcome guest!"
- #           "User Volume" -uamlist uams_clrtxt.so -port 12000
- #           "special" -notcp -defaultvol <path> -systemvol <path>
+ #       AppleTalk-only server:
+ #
+ #           "Guest Server" -uamlist uams_guest.so \
+ #                   -loginmesg "Welcome guest! I'm a public server."
+ #           "User Server" -uamlist uams_dhx2.so -port 12000
+ #           "special" -ddp -notcp -defaultvol <path> -systemvol <path>
  #