More spelling and grammer from Vance. <vance@digital-host.net>

Thanks!

Andrew Bartlett
(This used to be commit f019bed7663b4a20c1b5ab6b59fcadda17b89acd)

5 files changed, 28 insertions, 26 deletions

diff --git a/source3/lib/access.c b/source3/lib/access.c
index ff929d3549..f59bf86057 100644
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -52,7 +52,8 @@ static int string_match(char *tok,char *s, char *invalid_char)
 	 * return True if the string is a (host) member of the
 	 * netgroup. Return True if the token fully matches the
 	 * string. If the token is a netnumber/netmask pair, return
-	 * True if the address is a member of the specified subnet.  */
+	 * True if the address is a member of the specified subnet.  
+	 */
 
 	if (tok[0] == '.') {			/* domain: match last fields */
 		if ((str_len = strlen(s)) > (tok_len = strlen(tok))
@@ -212,12 +213,12 @@ BOOL allow_access(char **deny_list,char **allow_list,
 	if (!allow_list || *allow_list == 0)
 		return(!list_match(deny_list,(char *)client,client_match));
 
-	/* if there are both type of list then allow all hosts on the
+	/* if there are both types of list then allow all hosts on the
            allow list */
 	if (list_match(allow_list,(char *)client,client_match))
 		return (True);
 
-	/* if there are both type of list and it's not on the allow then
+	/* if there are both types of list and it's not on the allow then
 	   allow it if its not on the deny */
 	if (list_match(deny_list,(char *)client,client_match))
 		return (False);
diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index b130467b22..da123837d0 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 
 /* these functions provide a simple way to allocate integers from a
-   pool without repitition */
+   pool without repetition */
 
 /****************************************************************************
 allocate a bitmap of the specified size
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index d14a1f04e4..e55de729c2 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -77,10 +77,10 @@ void init_iconv(void)
 }
 
 /****************************************************************************
- Convert string from one encoding to another, makeing error checking etc
+ Convert string from one encoding to another, making error checking etc
  Parameters:
 	descriptor - conversion descriptor, created in init_iconv
- 	src - pointer to source string (multibute or singlebyte)
+ 	src - pointer to source string (multibyte or singlebyte)
 	srclen - length of the source string in bytes
 	dest - pointer to destination string (multibyte or singlebyte)
 	destlen - maximal length allowed for string
@@ -120,14 +120,14 @@ size_t convert_string(charset_t from, charset_t to,
 	if(retval==-1) 		
 	{    	char *reason="unknown error";
 		switch(errno)
-		{ case EINVAL: reason="Incomplete multybyte sequence"; break;
+		{ case EINVAL: reason="Incomplete multibyte sequence"; break;
 		  case E2BIG:  reason="No more room"; 
 		   	       DEBUG(0, ("Required %d, available %d\n",
 			       srclen, destlen));	
 		               break;
-		  case EILSEQ: reason="Illegal myltybyte sequence"; break;
+		  case EILSEQ: reason="Illegal myltibyte sequence"; break;
 		}
-		DEBUG(0,("Conversion error:%s(%s)\n",reason,inbuf));
+		DEBUG(0,("Conversion error: %s(%s)\n",reason,inbuf));
 		/* smb_panic(reason); */
 	}
 	return destlen-o_len;
@@ -336,7 +336,7 @@ int pull_ucs2_fstring(char *dest, const void *src)
 
 /****************************************************************************
 copy a string from a char* src to a unicode or ascii
-dos code page destination choosing unicode or ascii based on the 
+dos codepage destination choosing unicode or ascii based on the 
 flags in the SMB buffer starting at base_ptr
 return the number of bytes occupied by the string in the destination
 flags can have:
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 92b80c8736..a77328e343 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -26,7 +26,7 @@
  *
  *  FORMAT_BUFR_MAX - Index of the last byte of the format buffer;
  *                    format_bufr[FORMAT_BUFR_MAX] should always be reserved
- *                    for a terminating nul byte.
+ *                    for a terminating null byte.
  */
 
 #define FORMAT_BUFR_MAX ( sizeof( format_bufr ) - 1 )
@@ -125,10 +125,10 @@ static size_t     format_pos     = 0;
 static BOOL    log_overflow   = False;
 
 /*
-* Define all the debug class selection names here. Names *MUST NOT* contain 
-* white space. There must be one name for each DBGC_<class name>, and they 
-* must be in the table in the order of DBGC_<class name>.. 
-*/
+ * Define all the debug class selection names here. Names *MUST NOT* contain 
+ * white space. There must be one name for each DBGC_<class name>, and they 
+ * must be in the table in the order of DBGC_<class name>.. 
+ */
 char *classname_table[] = {
 	"all",               /* DBGC_ALL; index refs traditional DEBUGLEVEL */
 	"tdb",               /* DBGC_TDB	  */
@@ -183,7 +183,7 @@ BOOL debug_parse_params(char **params, int *debuglevel_class,
 	/* Set the new debug level array to the current DEBUGLEVEL array */
 	memcpy(debuglevel_class, DEBUGLEVEL_CLASS, sizeof(DEBUGLEVEL_CLASS));
 
-	/* Allow DBGC_ALL to be specifies w/o requiring its class name e.g."10"  
+	/* Allow DBGC_ALL to be specified w/o requiring its class name e.g."10"  
 	 * v.s. "all:10", this is the traditional way to set DEBUGLEVEL 
 	 */
 	if (isdigit((int)params[0][0])) {
@@ -192,7 +192,7 @@ BOOL debug_parse_params(char **params, int *debuglevel_class,
 		i = 1; /* start processing at the next params */
 	}
 	else
-		i = 0; /* DBGC_ALL not specified  OR class name was included */
+		i = 0; /* DBGC_ALL not specified OR class name was included */
 
 	/* Fill in new debug class levels */
 	for (; i < DBGC_LAST && params[i]; i++) {
@@ -317,7 +317,8 @@ void setup_logging(char *pname, BOOL interactive)
 			pname = p + 1;
 #ifdef LOG_DAEMON
 		openlog( pname, LOG_PID, SYSLOG_FACILITY );
-#else /* for old systems that have no facility codes. */
+#else
+		/* for old systems that have no facility codes. */
 		openlog( pname, LOG_PID );
 #endif
 	}
@@ -457,12 +458,12 @@ void check_log_size( void )
 
 	if(dbf == NULL) {
 		/* This code should only be reached in very strange
-			circumstances. If we merely fail to open the new log we
-			should stick with the old one. ergo this should only be
-			reached when opening the logs for the first time: at
-			startup or when the log level is increased from zero.
-			-dwg 6 June 2000
-		*/
+		 * circumstances. If we merely fail to open the new log we
+		 * should stick with the old one. ergo this should only be
+		 * reached when opening the logs for the first time: at
+		 * startup or when the log level is increased from zero.
+		 * -dwg 6 June 2000
+		 */
 		dbf = x_fopen( "/dev/console", O_WRONLY, 0);
 		if(dbf) {
 			DEBUG(0,("check_log_size: open of debug file %s failed - using console.\n",
@@ -661,7 +662,7 @@ void dbgflush( void )
  * Print a Debug Header.
  *
  *  Input:  level - Debug level of the message (not the system-wide debug
- *                  level.
+ *                  level. )
  *          file  - Pointer to a string containing the name of the file
  *                  from which this function was called, or an empty string
  *                  if the __FILE__ macro is not implemented.
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
index b74d0ba17c..11c9f23e9d 100644
--- a/source3/lib/dprintf.c
+++ b/source3/lib/dprintf.c
@@ -24,7 +24,7 @@
   this module provides functions for printing internal strings in the "display charset"
   This charset may be quite different from the chosen unix charset
 
-  Eventually these functions will need to take care of column count constaints
+  Eventually these functions will need to take care of column count constraints
 
   The d_ prefix on print functions in Samba refers to the display character set
   conversion