aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--FUTURES4
-rw-r--r--NEWS7
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/awkcard.in16
-rw-r--r--doc/gawk.14
5 files changed, 20 insertions, 15 deletions
diff --git a/FUTURES b/FUTURES
index 6b570567..03fe71dc 100644
--- a/FUTURES
+++ b/FUTURES
@@ -11,14 +11,14 @@ don't bug us too much about schedules or what all this really means.
For 4.1
=======
- Merge gawk/pgawk/dgawk into one executable
+ DONE: Merge gawk/pgawk/dgawk into one executable
Consider removing use of and/or need for the protos.h file.
Consider moving var_value info into Node_var itself
to reduce memory usage.
- Merge xmlgawk -l feature
+ DONE: Merge xmlgawk -l feature
Merge xmlgawk XML extensions
diff --git a/NEWS b/NEWS
index 14855011..803c1d52 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,10 @@ Changes from 4.0.1 to 4.1
1. The three executables gawk, pgawk, and dgawk, have been merged into
one, named just gawk. As a result:
* The -R option is gone
- * Use -D ...
- * Use -o ...
- * Use -p ...
+ * Use -D to run the debugger. An optional file argument is a
+ list of commands to run first.
+ * Use -o to do pretty-printing only.
+ * Use -p to do profiling.
2. The new -l option is used for loading dynamic extensions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7dda7e1d..eb9bbf45 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-28 Arnold D. Robbins <arnold@skeeve.com>
+
+ * awkcard.in, gawk.1: Minor edits after merge of executables.
+
2011-12-21 John Haque <j.eh@mchsi.com>
* gawk.texi: Updated sections on profiling and debugging
diff --git a/doc/awkcard.in b/doc/awkcard.in
index 862c307c..c8d41833 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -75,7 +75,7 @@ Pattern Elements 8
Printf Formats 14
Records 10
Regular Expressions 11
-Signals (\*(PK) 4
+Signals (\*(GK \*(FC\-\^\-profile\*(FR) 4
Special Filenames 12
String Functions 16
Time Functions (\*(GK) 17
@@ -302,12 +302,7 @@ Disable common and GNU extensions.
Enable \*(FIinterval expressions\*(FR in regular
expression matching (see \fHRegular
Expressions\fP below). Useful if
-\*(FC\-\^\-traditional\*(FR is specified.
-.TI "\*(FC\-S\*(FR, \*(FC\-\^\-sandbox\*(FR
-Disable the \*(FCsystem()\*(FR function,
-input redirection with \*(FCgetline\*(FR,
-output redirection with \*(FCprint\*(FR and \*(FCprintf\*(FR,
-and dynamic extensions loading.\*(CB
+\*(FC\-\^\-traditional\*(FR is specified.\*(CB
.in -4n
.EB "\s+2\f(HBCOMMAND LINE ARGUMENTS (\*(GK\f(HB)\*(FR\s0"
@@ -319,6 +314,11 @@ and dynamic extensions loading.\*(CB
.ES
.fi
.in +4n
+.TI "\*(FC\-S\*(FR, \*(FC\-\^\-sandbox\*(FR
+Disable the \*(FCsystem()\*(FR function,
+input redirection with \*(FCgetline\*(FR,
+output redirection with \*(FCprint\*(FR and \*(FCprintf\*(FR,
+and dynamic extensions loading.
.TI "\*(FC-t\*(FR, \*(FC\-\^\-lint\-old\*(FR
Warn about constructs that are not
portable to the original version of
@@ -390,7 +390,7 @@ and so on.\*(CB
\*(FCSIGUSR1\fP dumps a profile and function call stack to the
profile file. It then continues to run.
\*(FCSIGHUP\fP is similar, but exits.\*(CB
-.EB "\s+2\f(HBSIGNALS (\*(PK\f(HB)\*(FR\s0"
+.EB "\s+2\f(HBSIGNALS (\*(GK \f(HB\-\^\-profile)\*(FR\s0"
.\" --- Lines And Statements
.ES
diff --git a/doc/gawk.1 b/doc/gawk.1
index c171acbf..662ace35 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -97,8 +97,8 @@ while long options start with \*(lq\-\^\-\*(rq.
Long options are provided for both \*(GN-specific features and
for \*(PX-mandated features.
.PP
-.IR Gawk -
-specific options are typically used in long-option form.
+.IR Gawk -specific
+options are typically used in long-option form.
Arguments to long options are either joined with the option
by an
.B =