More typo fixes

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

18 files changed, 26 insertions, 27 deletions

diff --git a/Amoeba.cf b/Amoeba.cf
index 31cfd6c..c276565 100644
--- a/Amoeba.cf
+++ b/Amoeba.cf
@@ -175,7 +175,7 @@ AINSTALLFLAGS   =
 TOB             = /bin/sh $(CONFIGSRC)/util/aminstall.sh $(ABIN)
 MKXDIRHIER      = /bin/sh $(CONFIGSRC)/util/ammkdirhier.sh $(ABIN)
 
-/* Make wizardy: */
+/* Make wizardry: */
 COMPILE.c=$(CC) $(CFLAGS) $(CPPFLAGS) -c
 LINK.c=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
diff --git a/README b/README
index 847b03d..8cc6ed6 100644
--- a/README
+++ b/README
@@ -161,7 +161,7 @@ Imake.tmpl provides defaults for the following variables:
 	MsMacros		macro flag for TroffCmd, normally "-ms"
 	MvCmd			command to rename a file
 	NdbmDefines		-D's to turn on use of ndbm routines
-	NeedConstPrototoypes	whether const is supported
+	NeedConstPrototypes	whether const is supported
 	NeedFunctionPrototypes	whether or not to force function prototypes
 	NeedNestedPrototypes	whether nested prototypes are supported
 	NeedVarargsPrototypes	whether varargs prototypes are supported
@@ -173,7 +173,7 @@ Imake.tmpl provides defaults for the following variables:
 	OSName			operating system name
 	OSTeenyVersion		maintenance version number of operating system
 	OptimizedCDebugFlags	C compiler flags to turn on optimization
-	XtPopdownConformance	XtPopdown conformans to the specification
+	XtPopdownConformance	XtPopdown conformance to the specification
 	PreProcessCmd		command to run /lib/cpp on scripts
 	RanlibCmd		command to clean up libraries
 	RanlibInstFlags		flags to ranlib after copying
diff --git a/X11.tmpl b/X11.tmpl
index d417331..230c8aa 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1185,7 +1185,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #endif
 #endif
 
-#ifndef FontCacheExtentionDefines
+#ifndef FontCacheExtensionDefines
 #if BuildFontCache
 #define FontCacheExtensionDefines	-DFONTCACHE
 #else
diff --git a/bsdi.cf b/bsdi.cf
index d0d78ee..6849541 100644
--- a/bsdi.cf
+++ b/bsdi.cf
@@ -28,7 +28,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasMkstemp		YES
 #define HasUsableFileMmap	YES
 #define HasZlib			YES
-#define HasSetUseContext	YES
+#define HasSetUserContext	YES
 #define HasBSDAuth		YES
 #define HasSetProcTitle		YES
 #define HasBasename		NO
@@ -342,8 +342,7 @@ install.man:: 								@@\
 #define       XsunServer      YES             /* mono + 8 bit color */
 #endif
 #ifndef       Xsun24Server
-#define       Xsun24Server    NO              /* mono + 8 bit color + 24 bit c
-olor */
+#define       Xsun24Server    NO              /* mono + 8 bit color + 24 bit color */
 #endif
 
 #ifndef NeedConstPrototypes
diff --git a/cygwin.rules b/cygwin.rules
index 4bd182e..b6a7e9d 100644
--- a/cygwin.rules
+++ b/cygwin.rules
@@ -175,21 +175,21 @@ clean::									@@\
 #endif /* InstallSharedLibraryData */
 
 /*
- * MakeDllProg
+ * MakeDLLProg
  */
 
 #define MakeDLLProg(libname,solist,prog,rev)			        @@\
 	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
 
 /*
- * MakeDll
+ * MakeDLL
  */
 
 #define MakeDLL(libname,solist,rev)					@@\
     MakeDLLProg(libname,solist,$(CC),rev)
 
 /*
- * MakeCplusplusDll
+ * MakeCplusplusDLL
  */
 
 #define MakeCplusplusDLL(libname,solist,rev)				@@\
diff --git a/linux.cf b/linux.cf
index 517ae5c..cf39960 100644
--- a/linux.cf
+++ b/linux.cf
@@ -611,7 +611,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #   ifndef MakeDllModules
 #     define MakeDllModules	YES
 #   endif
-#  endif /* MipsArchitecure */
+#  endif /* MipsArchitecture */
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
 #   ifndef CcCmd
@@ -734,7 +734,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  ifdef i386Architecture
 #   define CcCmd		gcc -b i486-linux
 #   define AsCmd		CcCmd -c -x assembler
-#   define LdCmd		CcCmd -nosdlib -Wl,"-m elf_i386"
+#   define LdCmd		CcCmd -nostdlib -Wl,"-m elf_i386"
 #   define AsmDefines		-D__ELF__
 #   define CplusplusCmd		c++ -b i486-linux
 #  endif /* i386Architecture */
diff --git a/mingw.rules b/mingw.rules
index addedd3..90fe49e 100644
--- a/mingw.rules
+++ b/mingw.rules
@@ -156,21 +156,21 @@ clean::									@@\
 #endif /* InstallSharedLibraryData */
 
 /*
- * MakeDllProg
+ * MakeDLLProg
  */
 
 #define MakeDLLProg(libname,solist,prog,rev)			        @@\
 	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS) -lws2_32
 
 /*
- * MakeDll
+ * MakeDLL
  */
 
 #define MakeDLL(libname,solist,rev)					@@\
     MakeDLLProg(libname,solist,$(CC),rev)
 
 /*
- * MakeCplusplusDll
+ * MakeCplusplusDLL
  */
 
 #define MakeCplusplusDLL(libname,solist,rev)				@@\
diff --git a/oldlib.rules b/oldlib.rules
index 0075cd2..ad91569 100644
--- a/oldlib.rules
+++ b/oldlib.rules
@@ -41,7 +41,7 @@ clean::									@@\
 
 
 /*
- * DebuggedAndProfiledLibraryOjbectRule - generate make rules to build
+ * DebuggedAndProfiledLibraryObjectRule - generate make rules to build
  * debuggable, profiled, and "normal" objects.
  */
 #ifndef DebuggedAndProfiledLibraryObjectRule
diff --git a/os2.cf b/os2.cf
index 5b502f0..920b8a1 100644
--- a/os2.cf
+++ b/os2.cf
@@ -60,7 +60,7 @@ XCOMM hv: but in future a separate system)
 #define HasSockets		YES
 #define HasSnprintf		YES
 #define HasWChar32		NO
-#define HasUsableFileMap	NO
+#define HasUsableFileMmap	NO
 #define HasNCurses		YES
 #define HasVarRun		NO
 #define HasLibPthread		NO
diff --git a/sco.cf b/sco.cf
index 84a6bec..8d81a9f 100644
--- a/sco.cf
+++ b/sco.cf
@@ -52,7 +52,7 @@ XCOMM platform:  $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes
 # ifndef HasSymLinks
 #  define HasSymLinks           NO
 # endif
-# define CommpressManCmd        pack
+# define CompressManCmd         pack
 #endif
 
 /*
diff --git a/sequent.cf b/sequent.cf
index 1a3f748..755d05e 100644
--- a/sequent.cf
+++ b/sequent.cf
@@ -212,7 +212,7 @@ XCOMM operating system:  OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTee
  *
  * The following cpp macro defines have been introduced by Sequent.
  * They will be referenced in Sequent patches sent to TOG.
- * They may be moved above if accepted by TOG or X.org.
+ * They may be moved above if accepted by TOG or X.Org.
  */
 
 #define AdminBaseDir		  /usr/admin.ptx/etc/base.dir
@@ -264,7 +264,7 @@ XCOMM operating system:  OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTee
  * Sequent builds X11 and Motif in the same tree.
  * The Motif project files include the X11 project files.
  *
- * Later we may use the Local project files similer the the lynx.cf
+ * Later we may use the Local project files similar to the lynx.cf
  *
  * #define LocalTmplFile		<Motif.tmpl>
  * #define LocalRulesFile		<Motif.rules>
diff --git a/site.def.in b/site.def.in
index b3e5c1f..a632090 100644
--- a/site.def.in
+++ b/site.def.in
@@ -35,7 +35,7 @@ XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
 #ifdef BeforeVendorCF
 
 /*
- * Include this for easy XFree86 customisations
+ * Include this for easy XFree86 customizations
  */
 #ifndef SiteIConfigFiles
 #define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def
diff --git a/sun.cf b/sun.cf
index 608cf4b..1081891 100644
--- a/sun.cf
+++ b/sun.cf
@@ -659,7 +659,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #endif /* SPARC or Sun3/M68k */
 
 #if OSMajorVersion >= 4
-#define HasUsableFileMap YES
+#define HasUsableFileMmap YES
 #endif
 
 #ifndef UseDeprecatedKeyboardDriver
diff --git a/x386.cf b/x386.cf
index d7d4c80..65980ef 100644
--- a/x386.cf
+++ b/x386.cf
@@ -1,7 +1,7 @@
 XCOMM platform:  $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 /*****************************************************************************
- *			  Site-specfic parameters                            *
+ *			  Site-specific parameters                           *
  *****************************************************************************/
 
 /*
diff --git a/xf86.tmpl b/xf86.tmpl
index efc4aa5..ebc9367 100644
--- a/xf86.tmpl
+++ b/xf86.tmpl
@@ -70,7 +70,7 @@ MODULE_DEFINES = -DXFree86Module
 
 #if defined(IHaveModules) && DoLoadableServer
 
-/* This overrides the ObjCompile in Imake.rules! */
+/* This overrides the ObjectCompile in Imake.rules! */
 #undef ObjectCompile
 #define ObjectCompile(options) RemoveFile($@)                           @@\
 	ClearmakeOSName\
diff --git a/xf86site.def b/xf86site.def
index 1d74ac8..e05501d 100644
--- a/xf86site.def
+++ b/xf86site.def
@@ -285,7 +285,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 
 /*
  * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent existing application
+ * Uncommenting the following will prevent existing application
  * defaults files from being over-written.
  *
 #define InstallAppDefFiles	NO
diff --git a/xorg.tmpl b/xorg.tmpl
index 2026d9b..73a8a8c 100644
--- a/xorg.tmpl
+++ b/xorg.tmpl
@@ -87,7 +87,7 @@ MODULE_DEFINES = -DXFree86Module
 
 #if defined(IHaveModules) && DoLoadableServer
 
-/* This overrides the ObjCompile in Imake.rules! */
+/* This overrides the ObjectCompile in Imake.rules! */
 #undef ObjectCompile
 #define ObjectCompile(options) RemoveFile($@)                           @@\
 	ClearmakeOSName\
diff --git a/xorgsite.def b/xorgsite.def
index 9b5a675..8c9a4c7 100644
--- a/xorgsite.def
+++ b/xorgsite.def
@@ -295,7 +295,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 
 /*
  * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent existing application
+ * Uncommenting the following will prevent existing application
  * defaults files from being over-written.
  *
 #define InstallAppDefFiles	NO