Merge branch 'upstream'

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

Conflicts:
	jmake/jmake.man

1 files changed, 5 insertions, 5 deletions

diff --git a/mcon/U/d_scannl.U b/mcon/U/d_scannl.U
index 55f24cb..942ed0d 100644
--- a/mcon/U/d_scannl.U
+++ b/mcon/U/d_scannl.U
@@ -1,11 +1,11 @@
-?RCS: $Id: d_scannl.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_scannl.U 167 2013-05-08 17:58:00Z rmanfredi $
 ?RCS:
 ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 ?RCS: 
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
 ?RCS: of the source tree for dist 4.0.
 ?RCS:
 ?RCS: $Log: d_scannl.U,v $
@@ -19,7 +19,7 @@
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
 ?X:
-?X:	Does the scanf routine read "\n" corretly ? This is was not
+?X:	Does the scanf routine read "\n" correctly ? This is was not
 ?X:	the case on AIX...
 ?X:
 ?MAKE:d_scannl: cat +cc +ccflags rm Setvar
@@ -41,7 +41,7 @@
 : does scanf handle "\n" correctly ?
 echo " "
 val="$define"
-?X: I really want to say "\n" instead of '\n', becasue I am refering
+?X: I really want to say "\n" instead of '\n', because I am referring
 ?X:	to the string given as argument to scanf().
 echo 'Let'"'"'s see if scanf() handles "\\n" correctly...' >&4
 $cat >try.c <<'EOCP'