Merge branch 'extgawk'

1 files changed, 43 insertions, 40 deletions

diff --git a/doc/gawk.1 b/doc/gawk.1
index dbc2582b..494ab16d 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -14,7 +14,7 @@
 .		if \w'\(rq' .ds rq "\(rq
 .	\}
 .\}
-.TH GAWK 1 "Nov 10 2011" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Aug 09 2012" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -323,6 +323,19 @@ the standard output.
 these options cause an immediate, successful exit.)
 .TP
 .PD 0
+.BI "\-i " include-file
+.TP
+.PD
+.BI \-\^\-include " include-file"
+Load an awk source library.
+This searches for the library using the
+.B AWKPATH
+environment variable.  If the initial search fails, another attempt will
+be made after appending the ".awk" suffix.  The file will be loaded only
+once (i.e. duplicates are eliminated), and the code does not constitute
+the main program source.
+.TP
+.PD 0
 .BI "\-l " lib
 .TP
 .PD
@@ -334,7 +347,7 @@ This searches for the library using the
 environment variable.  If the initial search fails, another attempt will
 be made after appending the default shared library suffix for the platform.
 The library initialization routine is expected to be named
-.BR dlload() .
+.BR dl_load() .
 .TP
 .PD 0
 .BR "\-L " [ \fIvalue\fR ]
@@ -619,7 +632,9 @@ The environment variable
 specifies a search path to use when finding source files named with
 the
 .B \-f
-option.  If this variable does not exist, the default path is
+and
+.B \-i
+options.  If this variable does not exist, the default path is
 \fB".:/usr/local/share/awk"\fR.
 (The actual directory may vary, depending upon how
 .I gawk
@@ -2962,11 +2977,9 @@ integers, doing the operation, and then converting the
 result back to floating point.
 The functions are:
 .TP "\w'\fBrshift(\fIval\fB, \fIcount\fB)\fR'u+2n"
-\fBand(\fIv1\fB, \fIv2\fB)\fR
-Return the bitwise AND of the values provided by
-.I v1
-and
-.IR v2 .
+\fBand(\fIv1\fB, \fIv2 \fR[, ...]\fB)\fR
+Return the bitwise AND of the values provided in the argument list.
+There must be at least two.
 .TP
 \fBcompl(\fIval\fB)\fR
 Return the bitwise complement of
@@ -2979,11 +2992,9 @@ shifted left by
 .I count
 bits.
 .TP
-\fBor(\fIv1\fB, \fIv2\fB)\fR
-Return the bitwise OR of the values provided by
-.I v1
-and
-.IR v2 .
+\fBor(\fIv1\fB, \fIv2 \fR[, ...]\fB)\fR
+Return the bitwise OR of the values provided in the argument list.
+There must be at least two.
 .TP
 \fBrshift(\fIval\fB, \fIcount\fB)\fR
 Return the value of
@@ -2992,11 +3003,9 @@ shifted right by
 .I count
 bits.
 .TP
-\fBxor(\fIv1\fB, \fIv2\fB)\fR
-Return the bitwise XOR of the values provided by
-.I v1
-and
-.IR v2 .
+\fBxor(\fIv1\fB, \fIv2 \fR[, ...]\fB)\fR
+Return the bitwise XOR of the values provided in the argument list.
+There must be at least two.
 .PP
 .SS Type Function
 The following function is for use with multidimensional arrays.
@@ -3172,24 +3181,11 @@ may be used in place of
 .SH DYNAMICALLY LOADING NEW FUNCTIONS
 You can dynamically add new built-in functions to the running
 .I gawk
-interpreter.
+interpreter with the
+.B @load
+statement.
 The full details are beyond the scope of this manual page;
-see \*(EP for the details.
-.PP
-.TP 8
-\fBextension(\fIobject\fB, \fIfunction\fB)\fR
-Dynamically link the shared object file named by
-.IR object ,
-and invoke
-.I function
-in that object, to perform initialization.
-These should both be provided as strings.
-Return the value returned by
-.IR function .
-.PP
-Using this feature at the C level is not pretty, but
-it is unlikely to go away. Additional mechanisms may
-be added at some point.
+see \*(EP.
 .SH SIGNALS
 The
 .I gawk
@@ -3643,9 +3639,14 @@ environment variable can be used to provide a list of directories that
 .I gawk
 searches when looking for files named via the
 .B \-f
-and
+,
 .B \-\^\-file
-options.
+,
+.B \-i
+and
+.B \-\^\-include
+options.  If the initial search fails, the path is searched again after
+appending ".awk" to the filename.
 .PP
 The
 .B AWKLIBPATH
@@ -3713,7 +3714,7 @@ status is 2.  On non-POSIX systems, this value may be mapped to
 .SH VERSION INFORMATION
 This man page documents
 .IR gawk ,
-version 4.0.
+version 4.1.
 .SH AUTHORS
 The original version of \*(UX
 .I awk
@@ -3791,6 +3792,7 @@ While the
 developers occasionally read this newsgroup, posting bug reports there
 is an unreliable way to report bugs.  Instead, please use the electronic mail
 addresses given above.
+Really.
 .PP
 If you're using a GNU/Linux or BSD-based system,
 you may wish to submit a bug report to the vendor of your distribution.
@@ -3810,6 +3812,7 @@ are surprisingly difficult to diagnose in the completely general case,
 and the effort to do so really is not worth it.
 .SH SEE ALSO
 .IR egrep (1),
+.IR sed (1),
 .IR getpid (2),
 .IR getppid (2),
 .IR getpgrp (2),
@@ -3825,7 +3828,7 @@ Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger,
 Addison-Wesley, 1988.  ISBN 0-201-07981-X.
 .PP
 \*(EP,
-Edition 4.0, shipped with the
+Edition 4.1, shipped with the
 .I gawk
 source.
 The current version of this document is available online at
@@ -3872,7 +3875,7 @@ We thank him.
 .SH COPYING PERMISSIONS
 Copyright \(co 1989, 1991, 1992, 1993, 1994, 1995, 1996,
 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2009,
-2010, 2011
+2010, 2011, 2012
 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of