[Pkg-samba-maint] [samba] 86/135: docs: remove duplicate "or" from smb.conf manpage.

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 7d1b124f61a0a2b3f549a99d06889a56758b358e
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 19 12:33:33 2013 +0100

    docs: remove duplicate "or" from smb.conf manpage.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 59a240513c7d48afb337b102466c539af3f880f3)
---
 docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
index 974b6f0..54e7b87 100644
--- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
+++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
@@ -20,7 +20,7 @@
 	timestamp than the object files it contains.</para>
 
 	<para>However, Unix time semantics mean that the create time 
-	reported by Samba will be updated whenever a file is created or 
+	reported by Samba will be updated whenever a file is created
 	or deleted in the directory.  NMAKE finds all object files in 
 	the object directory.  The timestamp of the last one built is then 
 	compared to the timestamp of the object directory.  If the 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git