[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0pre1-244-gfd7aabd

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  fd7aabde447d10f9fa0fe44a92431c61446d3df9 (commit)
       via  74cc64393b9eb52841f252dd387f332084fc083a (commit)
       via  5ed569018a16eea4308e9eba193bc5b1cf8a2bb2 (commit)
      from  13174ada2f545c4e4f170c62a0f20eb24b52a866 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable


- Log -----------------------------------------------------------------
commit fd7aabde447d10f9fa0fe44a92431c61446d3df9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 29 10:57:48 2009 +0200

    s3/VERSION: Raise version number up to 3.4.0pre2.
    
    Karolin
    (cherry picked from commit 51610de47bb709739ba84075395f5409be5ebc5c)

commit 74cc64393b9eb52841f252dd387f332084fc083a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 27 18:13:09 2009 +0200

    s3/docs: Correct version number.
    
    Karolin
    (cherry picked from commit 136b885461b730cf226999b07d2198de8441ebc9)

commit 5ed569018a16eea4308e9eba193bc5b1cf8a2bb2
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri May 29 09:49:49 2009 +0200

    s3/docs: Fix typo.
    
    This fixes bug #4341.
    Thanks to Michael Cartmell <michael.cartmell [at] thomson.com> for reporting!
    
    Karolin
    (cherry picked from commit 2228cc6a0f942b774bef7fb0b99009897fa4dff4)
    (cherry picked from commit e1b1f14e0260395a8d452ea0a129bcc9bb3f98cc)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml |    2 +-
 docs-xml/Samba3-HOWTO/index.xml       |    2 +-
 source3/VERSION                       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
index b8bd327..91e9712 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
@@ -276,7 +276,7 @@ quotasettings:	gid nolimit = no
 
 		<para>
 <indexterm><primary>logging</primary></indexterm>
-		This auditing tool is more felxible than most people readily will recognize. There are a number of ways
+		This auditing tool is more flexible than most people will readily recognize. There are a number of ways
 		by which useful logging information can be recorded.
 		</para>
 
diff --git a/docs-xml/Samba3-HOWTO/index.xml b/docs-xml/Samba3-HOWTO/index.xml
index 87b0795..a0fb0fb 100644
--- a/docs-xml/Samba3-HOWTO/index.xml
+++ b/docs-xml/Samba3-HOWTO/index.xml
@@ -3,7 +3,7 @@
 
 <book id="Samba-HOWTO-Collection"
 	xmlns:xi="http://www.w3.org/2003/XInclude">
-<title>The Official Samba 3.2.x HOWTO and Reference Guide</title>
+<title>The Official Samba 3.4.x HOWTO and Reference Guide</title>
 
 <bookinfo>
 	<authorgroup>
diff --git a/source3/VERSION b/source3/VERSION
index 1326b45..dbbe6cb 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION=
 # e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
 #  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=1
+SAMBA_VERSION_PRE_RELEASE=2
 
 ########################################################
 # For 'rc' releases the version will be                #


-- 
Samba Shared Repository