From: Casey West <casey@geeknest.com>
Date: Fri, 9 May 2003 04:00:44 +0000 (-0400)
Subject: [perl #8599] s/catenate/concatenate/
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3099fc99273017468e5ddf7177e6764cfc105a6a;p=p5sagit%2Fp5-mst-13.2.git

[perl #8599] s/catenate/concatenate/
Message-ID: <20030509080044.GA49820@geeknest.com>

(except for the dup.t patch which diddled with system().)

p4raw-id: //depot/perl@19518
---

diff --git a/Configure b/Configure
index ee4d516..181d2b3 100755
--- a/Configure
+++ b/Configure
@@ -17229,9 +17229,9 @@ esac
 : set the base revision
 baserev=5.0
 
-: how do we catenate cpp tokens here?
+: how do we concatenate cpp tokens here?
 echo " "
-echo "Checking to see how your cpp does stuff like catenate tokens..." >&4
+echo "Checking to see how your cpp does stuff like concatenate tokens..." >&4
 $cat >cpp_stuff.c <<'EOCP'
 #define RCAT(a,b)a/**/b
 #define ACAT(a,b)a ## b
@@ -17250,8 +17250,8 @@ elif $contains 'Reiser' cpp_stuff.out >/dev/null 2>&1; then
 	cpp_stuff=1
 else
 	$cat >&4 <<EOM
-Hmm, I don't seem to be able to catenate tokens with your cpp.  You're going
-to have to edit the values of CAT[2-5] in config.h...
+Hmm, I don't seem to be able to concatenate tokens with your cpp.
+You're going to have to edit the values of CAT[2-5] in config.h...
 EOM
 	cpp_stuff="/* Help! How do we handle cpp_stuff? */*/"
 fi
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 1a255b1..a1f6bad 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1146,7 +1146,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/Porting/config_H b/Porting/config_H
index 910593a..f66ede8 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -1500,7 +1500,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/README.Y2K b/README.Y2K
index be7ff51..a3eb550 100644
--- a/README.Y2K
+++ b/README.Y2K
@@ -40,7 +40,7 @@ Long answer: The question belies a true understanding of the
        longer exposition.
 
        If you want perl to warn you when it sees a program which
-       catenates a number with the string "19" -- a common
+       concatenates a number with the string "19" -- a common
        indication of a year 2000 problem -- build perl using the
        Configure option  "-Accflags=-DPERL_Y2KWARN".
        (See the file INSTALL for more information about building
diff --git a/config_h.SH b/config_h.SH
index a6c9e32..3820677 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -1500,7 +1500,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define OSVERS "$osvers"		/**/
 
 /* CAT2:
- *	This macro catenates 2 tokens together.
+ *	This macro concatenates 2 tokens together.
  */
 /* STRINGIFY:
  *	This macro surrounds its token with double quotes.
@@ -1520,7 +1520,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if $cpp_stuff != 1 && $cpp_stuff != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index d3a2987..fd544cd 100644
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -207,7 +207,7 @@ on some OSs.
 =item catpath()
 
 Takes volume, directory and file portions and returns an entire path. Under
-Unix, $volume is ignored, and directory and file are catenated.  A '/' is
+Unix, $volume is ignored, and directory and file are concatenated.  A '/' is
 inserted if need be.  On other OSs, $volume is significant.
 
     $full_path = File::Spec->catpath( $volume, $directory, $file );
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
index 1b882df..904b657 100644
--- a/lib/File/Spec/Unix.pm
+++ b/lib/File/Spec/Unix.pm
@@ -326,7 +326,7 @@ sub splitdir {
 =item catpath()
 
 Takes volume, directory and file portions and returns an entire path. Under
-Unix, $volume is ignored, and directory and file are catenated.  A '/' is
+Unix, $volume is ignored, and directory and file are concatenated.  A '/' is
 inserted if needed (though if the directory portion doesn't start with
 '/' it is not added).  On other OSs, $volume is significant.
 
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index ee9a9aa..5b509c2 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -1136,7 +1136,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index 8740853..2134e45 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -1087,7 +1087,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/uconfig.h b/uconfig.h
index 08888f4..1f7fa46 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1476,7 +1476,7 @@
 #define OSVERS ""		/**/
 
 /* CAT2:
- *	This macro catenates 2 tokens together.
+ *	This macro concatenates 2 tokens together.
  */
 /* STRINGIFY:
  *	This macro surrounds its token with double quotes.
@@ -1496,7 +1496,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/win32/config_H.bc b/win32/config_H.bc
index bc3efa9..11c311c 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -1502,7 +1502,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 3c07bf1..2392b0e 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -1502,7 +1502,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 62e3772..d51f70d 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -1502,7 +1502,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/win32/config_H.vc64 b/win32/config_H.vc64
index 0654a08..5245268 100644
--- a/win32/config_H.vc64
+++ b/win32/config_H.vc64
@@ -1502,7 +1502,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN:
diff --git a/wince/config_H.ce b/wince/config_H.ce
index aa934c9..029ee4d 100644
--- a/wince/config_H.ce
+++ b/wince/config_H.ce
@@ -1093,7 +1093,7 @@
 #define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
-#   include "Bletch: How does this C preprocessor catenate tokens?"
+#   include "Bletch: How does this C preprocessor concatenate tokens?"
 #endif
 
 /* CPPSTDIN: