>Number:         19141
>Category:       bin
>Synopsis:       Typos in make (mostly in source)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people
>State:          open
>Class:          doc-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 23 01:26:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6K
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.6K NetBSD 1.6K (DARKSTAR) #133: Sun Nov 17 21:31:10 CET 2002 sysbuild@darkstar.local:/var/sysbuild/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	There are several comments inside make's source which contain some
	typos. Jim Geovedi sent me a patch with these fixes for buildtool's
	make. But as bt_make is almost the same as netbsd's make, I've
	adapted the patch with the fixes ;)
>How-To-Repeat:
	
>Fix:

Index: arch.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/arch.c,v
retrieving revision 1.35
diff -u -u -r1.35 arch.c
--- arch.c	2002/06/15 18:24:55	1.35
+++ arch.c	2002/11/23 09:20:35
@@ -316,8 +316,8 @@
 	/*
 	 * If member contains variables, try and substitute for them.
 	 * This will slow down archive specs with dynamic sources, of course,
-	 * since we'll be (non-)substituting them three times, but them's
-	 * the breaks -- we need to do this since SuffExpandChildren calls
+	 * since we'll be (non-)substituting them three times, but their
+	 * breaks -- we need to do this since SuffExpandChildren calls
 	 * us, otherwise we could assume the thing would be taken care of
 	 * later.
 	 */
Index: buf.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/buf.c,v
retrieving revision 1.13
diff -u -u -r1.13 buf.c
--- buf.c	2002/06/15 18:24:55	1.13
+++ buf.c	2002/11/23 09:20:35
@@ -289,7 +289,7 @@
  *     None.
  *
  * Side Effects:
- *     If the buffer was empty intially, then a new byte will be added.
+ *     If the buffer was empty initially, then a new byte will be added.
  *     Otherwise, the last byte is overwritten.
  *
  *-----------------------------------------------------------------------
Index: compat.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/compat.c,v
retrieving revision 1.44
diff -u -u -r1.44 compat.c
--- compat.c	2002/06/15 18:24:56	1.44
+++ compat.c	2002/11/23 09:20:35
@@ -61,7 +61,7 @@
  *
  * Interface:
  *	Compat_Run	    Initialize things for this module and recreate
- *	    	  	    thems as need creatin'
+ *	    	  	    them as need creating.
  */
 
 #include    <sys/types.h>
@@ -105,7 +105,7 @@
  *
  * Side Effects:
  *	The target is removed and the process exits. If .INTERRUPT exists,
- *	its commands are run first WITH INTERRUPTS IGNORED..
+ *	its commands are run first WITH INTERRUPTS IGNORED.
  *
  *-----------------------------------------------------------------------
  */
Index: for.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/for.c,v
retrieving revision 1.13
diff -u -u -r1.13 for.c
--- for.c	2002/06/15 18:24:56	1.13
+++ for.c	2002/11/23 09:20:36
@@ -77,7 +77,7 @@
  * the initial .for loop and the matching .endfor;
  * then we evaluate the for loop for each variable in the varlist.
  *
- * Note that any nested fors are just passed through; they get handled
+ * Note that any nested for are just passed through; they get handled
  * recursively in For_Eval when we're expanding the enclosing for in
  * For_Run.
  */
Index: job.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/job.c,v
retrieving revision 1.73
diff -u -u -r1.73 job.c
--- job.c	2002/11/16 22:22:23	1.73
+++ job.c	2002/11/23 09:20:37
@@ -73,7 +73,7 @@
  *	    	  	    	a time given by the SEL_* constants, below,
  *	    	  	    	or until output is ready.
  *
- *	Job_Init  	    	Called to intialize this module. in addition,
+ *	Job_Init  	    	Called to initialize this module. in addition,
  *	    	  	    	any commands attached to the .BEGIN target
  *	    	  	    	are executed before this function returns.
  *	    	  	    	Hence, the makefile must have been parsed
@@ -830,7 +830,7 @@
  *	Do final processing for the given job including updating
  *	parents and starting new jobs as available/necessary. Note
  *	that we pay no attention to the JOB_IGNERR flag here.
- *	This is because when we're called because of a noexecute flag
+ *	This is because when we're called because of a no-execute flag
  *	or something, jstat.w_status is 0 and when called from
  *	Job_CatchChildren, the status is zeroed if it s/b ignored.
  *
@@ -2149,7 +2149,7 @@
  *	this makes up a line, we print it tagged by the job's identifier,
  *	as necessary.
  *	If output has been collected in a temporary file, we open the
- *	file and read it line by line, transfering it to our own
+ *	file and read it line by line, transferring it to our own
  *	output channel until the file is empty. At which point we
  *	remove the temporary file.
  *	In both cases, however, we keep our figurative eye out for the
@@ -3173,7 +3173,7 @@
  *	None
  *
  * Side Effects:
- *	All children are killed, not just the firstborn
+ *	All children are killed, not just the first-born.
  *-----------------------------------------------------------------------
  */
 void
Index: make.1
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/make.1,v
retrieving revision 1.68
diff -u -u -r1.68 make.1
--- make.1	2002/11/02 04:13:41	1.68
+++ make.1	2002/11/23 09:20:38
@@ -484,7 +484,7 @@
 This variable is used to record the names of variables assigned to
 on the command line, so that they may be exported as part of
 .Ql Ev MAKEFLAGS .
-This behaviour can be disabled by assigning an empty value to
+This behavior can be disabled by assigning an empty value to
 .Ql Va .MAKEOVERRIDES
 within a makefile.
 Extra variables can be exported from a makefile
@@ -539,7 +539,7 @@
 to the value of
 .Ql Ev PWD
 instead.
-This behaviour is disabled if
+This behavior is disabled if
 .Ql Ev MAKEOBJDIRPREFIX
 is set.
 .Ql Ev PWD
Index: make.c
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/make.c,v
retrieving revision 1.50
diff -u -u -r1.50 make.c
--- make.c	2002/06/15 18:24:57	1.50
+++ make.c	2002/11/23 09:20:39
@@ -1182,7 +1182,7 @@
      * the only time when it will be empty is when all the jobs which need
      * running have been run, so that is the end condition of this loop.
      * Note that the Job module will exit if there were any errors unless the
-     * keepgoing flag was given.
+     * keep-going flag was given.
      */
     while (!Lst_IsEmpty(toBeMade) || !Job_Empty ()) {
 	Job_CatchOutput ();
Index: make.h
===================================================================
RCS file: /cvsroot/basesrc/usr.bin/make/make.h,v
retrieving revision 1.44
diff -u -u -r1.44 make.h
--- make.h	2002/06/15 18:24:57	1.44
+++ make.h	2002/11/23 09:20:40
@@ -133,7 +133,7 @@
 				 *  	node marked this way, it is printed
 				 *  	and 'made' is changed to ENDCYCLE.
 				 *  ENDCYCLE - the cycle has been completely
-				 *  	printed. Go back and unmark all its
+				 *  	printed. Go back and un-mark all its
 				 *  	members.
 				 */
     int             unmade;    	/* The number of unmade children */
>Release-Note:
>Audit-Trail:
>Unformatted: