Prepare 3.1-beta2 release, update manpages

diff --git a/VERSION b/VERSION
index 6dd5f8c7c6198a85b5d6b998dedce87054d40e56..327e66a7a1c19664ffa9a879074a946fe02941a1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1-beta1
\ No newline at end of file
+3.1-beta2
\ No newline at end of file

diff --git a/doc/www/ReleaseNotes b/doc/www/ReleaseNotes
index 49e9b8c76aaf385e0f76a56c330b1ecab1b5dcda..7ec41372a86c6ab024e9ea7258e465855f467da4 100644 (file)
--- a/doc/www/ReleaseNotes
+++ b/doc/www/ReleaseNotes
@@ -1,7 +1,7 @@
-Netatalk 3.1-beta1
+Netatalk 3.1-beta2
 ===================
 
-The Netatalk development team is proud to announce the first beta release
+The Netatalk development team is proud to announce the second beta release
 of the next Netatalk version 3.1. This release is intended for testing only.
 
 Netatalk is a freely-available Open Source AFP fileserver.
@@ -43,6 +43,10 @@ at:
 
 http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
+Changes in 3.1-beta2
+~~~~~~~~~~~~~~~~~~~~
+* FIX: Fix special Spotlight RPC function
+
 Changes in 3.1-beta1
 ~~~~~~~~~~~~~~~~~~~~
 * REM: Remove support for Tracker versions < 0.7
@@ -59,6 +63,13 @@ Changes in 3.1-alpha1
 * UPD: Add configure option --with-afpstats for overriding the
        result of autodetecting dbus-glib presence
 
+Changes in 3.0.6
+~~~~~~~~~~~~~~~~
+* FIX: charset conversion failed when copying from Mac OS 9. Bug #523.
+* UPD: Don't force S_ISGID for directories on FreeBSD. Bug #525.
+* NEW: Add support for ZFS ACLs on FreeBSD with libsunacl. From FR#83.
+* FIX: Active Directory LDAP queries for ACL support with new options
+       "ldap user filter" and "ldap group filter". Bug #526.
 
 Changes in 3.0.5
 ~~~~~~~~~~~~~~~~
@@ -353,4 +364,4 @@ We would like to thank all contributors to the Netatalk project for
 their commitment.  Without the many suggestions, bug and problem reports,
 patches, and reviews this project wouldn't be where it is.
 
- - The Netatalk Development Team, August 2013
+ - The Netatalk Development Team, September 2013

diff --git a/man/man5/afp.conf.5.in b/man/man5/afp.conf.5.in
index b6d250c5a6d8b98430d0ea47ed42dc31e201c95c..2cac69d423e9eb0ecc96d254e5ad015c5f26f4fa 100644 (file)
--- a/man/man5/afp.conf.5.in
+++ b/man/man5/afp.conf.5.in
@@ -2,12 +2,12 @@
 .\"     Title: afp.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 30 Apr 2013
+.\"      Date: 13 Sep 2013
 .\"    Manual: @NETATALK_VERSION@
 .\"    Source: @NETATALK_VERSION@
 .\"  Language: English
 .\"
-.TH "AFP\&.CONF" "5" "30 Apr 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@"
+.TH "AFP\&.CONF" "5" "13 Sep 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -472,7 +472,7 @@ Sets the maximum number of clients that can simultaneously connect to the server
 .PP
 server quantum = \fInumber\fR \fB(G)\fR
 .RS 4
-This specifies the DSI server quantum\&. The default value is 1 MB\&. The maximum value is 0xFFFFFFFFF, the minimum is 32000\&. If you specify a value that is out of range, the default value will be set\&. Do not change this value unless you\*(Aqre absolutely sure, what you\*(Aqre doing
+This specifies the DSI server quantum\&. The default value is 0x100000 (1 MiB)\&. The maximum value is 0xFFFFFFFFF, the minimum is 32000\&. If you specify a value that is out of range, the default value will be set\&. Do not change this value unless you\*(Aqre absolutely sure, what you\*(Aqre doing
 .RE
 .PP
 sleep time = \fInumber\fR \fB(G)\fR
@@ -602,9 +602,7 @@ Whether to enable Spotlight searches\&. Note: once the global option is enabled,
 .PP
 veto message = \fIBOOLEAN\fR (default: \fIno\fR) \fB(G)\fR
 .RS 4
-Use section
-\fBname\fR
-as option preset for all volumes (when set in the [Global] section) or for one volume (when set in that volume\*(Aqs section)\&.
+Send optional AFP messages for vetoed files\&. Then whenever a client tries to access any file or directory with a vetoed name, it will be sent an AFP message indicating the name and the directory\&.
 .RE
 .PP
 vol dbpath = \fIpath\fR \fB(G)\fR