Fix spelling/wording issues

Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

11 files changed, 16 insertions, 16 deletions

diff --git a/README.md b/README.md
index da6a937..e40e42a 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ configure script takes various options to enable or disable them:
 
 - Font services:
 
-  * xfs font servers - allows retreiving fonts as a client of an xfs server.  
+  * xfs font servers - allows retrieving fonts as a client of an xfs server.
     Enabled by default, disable via --disable-fc (font client).
 
     If enabled, you can also use the standard libxtrans flags to
@@ -74,7 +74,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/lib/libXfont
 
diff --git a/doc/fontlib.xml b/doc/fontlib.xml
index ce31bb5..ba93396 100644
--- a/doc/fontlib.xml
+++ b/doc/fontlib.xml
@@ -176,7 +176,7 @@
 	bitmap-font specific interfaces which those applications use,
 	instead of the more general interfaces used by the X and font
 	servers, which are unaware of the source of the font data.
-	These routines will be refered to as the bitmap font access
+	These routines will be referred to as the bitmap font access
 	methods.
       </para>
 
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index e98f920..0d529a8 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -94,7 +94,7 @@ static CharInfoRec noSuchChar = { /* metrics */{0,0,0,0,0,0},
 				  /* bits */   NULL };
 #endif
 
-/* The propery names for all the XLFD properties. */
+/* The property names for all the XLFD properties. */
 
 static const char *xlfd_props[] = {
     "FOUNDRY",
@@ -1562,7 +1562,7 @@ FreeTypeUnloadXFont(FontPtr pFont)
 /* Add the font properties, including the Font name, the XLFD
    properties, some strings from the font, and various typographical
    data.  We only provide data readily available in the tables in the
-   font for now, altough FIGURE_WIDTH would be a good idea as it is
+   font for now, although FIGURE_WIDTH would be a good idea as it is
    used by Xaw. */
 
 static int
@@ -2413,7 +2413,7 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals,
 	    goto quit;
 	}
     }
-    /* doube striking */
+    /* double striking */
     if (SPropRecValList_search_record(&listPropRecVal,
                                       &contRecValue,
                                       "DoubleStrike")) {
diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c
index f54f76c..f1c3cf0 100644
--- a/src/FreeType/xttcap.c
+++ b/src/FreeType/xttcap.c
@@ -393,7 +393,7 @@ get_one_line(FILE *is, char *buf)
             /* End of Line */
             break;
         if (isspace(c)) {
-            /* convine multiple spaces */
+            /* combine multiple spaces */
             if (!flHead)
                 /* except space at the head of line */
                 flSpace = True;
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
index f4340b9..a9f353a 100644
--- a/src/bitmap/bdfread.c
+++ b/src/bitmap/bdfread.c
@@ -677,7 +677,7 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
 
 	case 2:
 	    /*
-	     * Possibilites include: valid quoted string with no white space
+	     * Possibilities include: valid quoted string with no white space
 	     * valid integer value invalid value
 	     */
 	    if (secondbuf[0] == '"') {
@@ -698,7 +698,7 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
 
 	case 3:
 	    /*
-	     * Possibilites include: valid quoted string with some white space
+	     * Possibilities include: valid quoted string with some white space
 	     * invalid value (reject even if second string is integer)
 	     */
 	    if (secondbuf[0] == '"') {
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index bf64d6f..882318b 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -197,7 +197,7 @@ pcfGetCompressedMetric(FontFilePtr file, CARD32 format, xCharInfo *metric)
 }
 
 /*
- * Position the file to the begining of the specified table
+ * Position the file to the beginning of the specified table
  * in the font file
  */
 static Bool
diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h
index 8f39ded..83eb428 100644
--- a/src/bitmap/snfstr.h
+++ b/src/bitmap/snfstr.h
@@ -67,7 +67,7 @@ from The Open Group.
  *	1)  The XFONTINFO structure
  *		hand-padded to a two-short boundary.
  *		maxbounds.byteoffset is the total number of bytes in the
- *			glpyh array
+ *			glyph array
  *		maxbounds.bitOffset is thetotal width of the unpadded font
  *
  *	2)  The XCHARINFO array
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index e739a8f..94604d7 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -179,7 +179,7 @@ fs_fd_handler(int fd, void *data);
  * the font server, and a block record to be stored in the fpe's list
  * of outstanding requests.  the FS block handler also sticks the
  * proper set of fd's into the select mask.  when data is ready to be
- * read in, the FS wakup handler will be hit.  this will read the
+ * read in, the FS wakeup handler will be hit.  this will read the
  * data off the wire into the proper block record, and then signal the
  * client that caused the block so that it can restart.  it will then
  * call the access function again, which will realize that the data has
@@ -536,7 +536,7 @@ conn_stop_listening(FSFpePtr conn)
 
 /*
  * When a request is aborted due to a font server failure,
- * signal any depending clients to restart their dependant
+ * signal any depending clients to restart their dependent
  * requests
  */
 static void
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index 42e7aa0..c59937c 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -16,7 +16,7 @@
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /*
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 58ca491..a875408 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -249,7 +249,7 @@ AddFileNameAliases(FontDirectoryPtr dir)
  *
  * alias font-name
  *
- * To imbed white-space in an alias name, enclose it like "font name"
+ * To embed white-space in an alias name, enclose it like "font name"
  * in double quotes.  \ escapes and character, so
  * "font name \"With Double Quotes\" \\ and \\ back-slashes"
  * works just fine.
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index fe1c412..fcdefe8 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
 #include "libxfontint.h"
 #include <X11/fonts/fontmisc.h>
 
-/* Utility functions for reformating font bitmaps */
+/* Utility functions for reformatting font bitmaps */
 
 static const unsigned char _reverse_byte[0x100] = {
 	0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,