diff --git a/docs-xml/using_samba/ch06.xml b/docs-xml/using_samba/ch06.xml
index a4a9160e081..8e8740b8b6c 100644
--- a/docs-xml/using_samba/ch06.xml
+++ b/docs-xml/using_samba/ch06.xml
@@ -2322,7 +2322,7 @@ local group map</title>
 
 
 <para>One warning: because these scripts are loaded by Windows and executed on the Windows side, they must consist of DOS formatted <indexterm id="ch06-idx-968122-0"><primary>carriage-returns for scripts</primary></indexterm>
-<indexterm id="ch06-idx-968122-1"><primary>DOS-formated carriage returns</primary></indexterm>
+<indexterm id="ch06-idx-968122-1"><primary>DOS-formatted carriage returns</primary></indexterm>
 <indexterm id="ch06-idx-968122-2"><primary>Unix</primary><secondary> carriage returns</secondary></indexterm>carriage-return/linefeed characters instead of Unix carriage returns. It's best to use a DOS- or Windows-based editor to create them.</para>
 
 
diff --git a/docs-xml/xslt/latex/sambadoc.cls b/docs-xml/xslt/latex/sambadoc.cls
index 20c81325f73..b7f634f6d9a 100644
--- a/docs-xml/xslt/latex/sambadoc.cls
+++ b/docs-xml/xslt/latex/sambadoc.cls
@@ -18,7 +18,7 @@
 %================================================================================
 % 1. Page layout dimensions
 % 3. Define new fonts for headings
-% 4. Redefines the way "figure" amd "table" are formated in a \caption
+% 4. Redefines the way "figure" amd "table" are formatted in a \caption
 % 5. Defines a \capt macro which defines (1) \captwidth, (2) \captsize
 %    and \beforetableskip.
 % 6. Defines and modifies FANCYHDS.STY for headers and foots
diff --git a/lib/replace/snprintf.c b/lib/replace/snprintf.c
index 63eb0362404..2cd9c43ce12 100644
--- a/lib/replace/snprintf.c
+++ b/lib/replace/snprintf.c
@@ -34,7 +34,7 @@
  *    probably requires libm on most operating systems.  Don't yet
  *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
  *    was pretty badly broken, it just wasn't being exercised in ways
- *    which showed it, so that's been fixed.  Also, formated the code
+ *    which showed it, so that's been fixed.  Also, formatted the code
  *    to mutt conventions, and removed dead code left over from the
  *    original.  Also, there is now a builtin-test, just compile with:
  *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm