[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f87dcdc docs: Fix typo.
       via  415235b docs: Fix typo.
      from  cf87f85 time: prefer CLOCK_BOOTTIME for clock_gettime_mono()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f87dcdcf559acf48a095dc6b2614a65984904b0c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jul 8 09:20:33 2013 +0200

    docs: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jul  8 12:19:38 CEST 2013 on sn-devel-104

commit 415235b62d17f9a32dff53367f5f44585c33afd6
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jul 8 09:18:17 2013 +0200

    docs: Fix typo.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 docs-xml/smbdotconf/protocol/clientminprotocol.xml |    2 +-
 docs-xml/smbdotconf/tuning/usentdb.xml             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index 8687c5f..84e03ea 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -12,7 +12,7 @@
 	the appropriate protocol.</para>
 
 	<para>See <related>client max protocol</related> for a full list
-	of avaiable protocols</para>
+	of available protocols.</para>
 </description>
 
 <related>client max protocol</related>
diff --git a/docs-xml/smbdotconf/tuning/usentdb.xml b/docs-xml/smbdotconf/tuning/usentdb.xml
index 6d5ca48..18f46a6 100644
--- a/docs-xml/smbdotconf/tuning/usentdb.xml
+++ b/docs-xml/smbdotconf/tuning/usentdb.xml
@@ -13,7 +13,7 @@
     <filename>.tdb.bak</filename>.
     </para>
     <para>Filenames explicitly specified in
-    <filename>smb.conf</filename> will be respected (ie. the format
+    <filename>smb.conf</filename> will be respected (i.e. the format
     will depend on the <filename>.ntdb</filename> or
     <filename>.tdb</filename> extension).
     </para>


-- 
Samba Shared Repository