Merge branch 'gawk-4.0-stable'

3 files changed, 413 insertions, 3 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7b27836c..2d3dbae2 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -182,7 +182,6 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 STRIP = @STRIP@
-U = @U@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
diff --git a/doc/gawk.info b/doc/gawk.info
index 619faffa..b92d1b87 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -21269,7 +21269,7 @@ considered authoritative if it conflicts with this Info file.
 MS-DOS with DJGPP       Scott Deifik, <scottd.mail@sbcglobal.net>.
 MS-Windows with MINGW   Eli Zaretskii, <eliz@gnu.org>.
 OS/2                    Andreas Buening, <andreas.buening@nexgo.de>.
-VMS                     Pat Rankin, <rankin@pactechdata.com>.
+VMS                     Pat Rankin, <r.pat.rankin@gmail.com>
 z/OS (OS/390)           Dave Pitts, <dpitts@cozx.com>.
 
    If your bug is also reproducible under Unix, please send a copy of
@@ -27438,6 +27438,7 @@ Index
 
 
 Tag Table:
+<<<<<<< HEAD
 Node: Top1345
 Node: Foreword33439
 Node: Preface37784
@@ -27821,6 +27822,391 @@ Node: VMS Installation Details845806
 Node: VMS Running847441
 Node: VMS Old Gawk849048
 Node: Bugs849522
+=======
+Node: Top1346
+Node: Foreword33440
+Node: Preface37785
+Ref: Preface-Footnote-140838
+Ref: Preface-Footnote-240944
+Node: History41176
+Node: Names43567
+Ref: Names-Footnote-145044
+Node: This Manual45116
+Ref: This Manual-Footnote-150063
+Node: Conventions50163
+Node: Manual History52297
+Ref: Manual History-Footnote-155567
+Ref: Manual History-Footnote-255608
+Node: How To Contribute55682
+Node: Acknowledgments56826
+Node: Getting Started61157
+Node: Running gawk63536
+Node: One-shot64722
+Node: Read Terminal65947
+Ref: Read Terminal-Footnote-167597
+Ref: Read Terminal-Footnote-267873
+Node: Long68044
+Node: Executable Scripts69420
+Ref: Executable Scripts-Footnote-171289
+Ref: Executable Scripts-Footnote-271391
+Node: Comments71842
+Node: Quoting74309
+Node: DOS Quoting78932
+Node: Sample Data Files79607
+Node: Very Simple82639
+Node: Two Rules87238
+Node: More Complex89385
+Ref: More Complex-Footnote-192315
+Node: Statements/Lines92400
+Ref: Statements/Lines-Footnote-196862
+Node: Other Features97127
+Node: When98055
+Node: Invoking Gawk100202
+Node: Command Line101587
+Node: Options102370
+Ref: Options-Footnote-1115807
+Node: Other Arguments115832
+Node: Naming Standard Input118490
+Node: Environment Variables119584
+Node: AWKPATH Variable120028
+Ref: AWKPATH Variable-Footnote-1122625
+Node: Other Environment Variables122885
+Node: Exit Status125225
+Node: Include Files125900
+Node: Obsolete129385
+Node: Undocumented130071
+Node: Regexp130312
+Node: Regexp Usage131701
+Node: Escape Sequences133727
+Node: Regexp Operators139490
+Ref: Regexp Operators-Footnote-1146687
+Ref: Regexp Operators-Footnote-2146834
+Node: Bracket Expressions146932
+Ref: table-char-classes148822
+Node: GNU Regexp Operators151345
+Node: Case-sensitivity155068
+Ref: Case-sensitivity-Footnote-1158036
+Ref: Case-sensitivity-Footnote-2158271
+Node: Leftmost Longest158379
+Node: Computed Regexps159580
+Node: Reading Files162990
+Node: Records164931
+Ref: Records-Footnote-1173605
+Node: Fields173642
+Ref: Fields-Footnote-1176675
+Node: Nonconstant Fields176761
+Node: Changing Fields178963
+Node: Field Separators184941
+Node: Default Field Splitting187570
+Node: Regexp Field Splitting188687
+Node: Single Character Fields192029
+Node: Command Line Field Separator193088
+Node: Field Splitting Summary196529
+Ref: Field Splitting Summary-Footnote-1199721
+Node: Constant Size199822
+Node: Splitting By Content204406
+Ref: Splitting By Content-Footnote-1208132
+Node: Multiple Line208172
+Ref: Multiple Line-Footnote-1214019
+Node: Getline214198
+Node: Plain Getline216426
+Node: Getline/Variable218515
+Node: Getline/File219656
+Node: Getline/Variable/File220978
+Ref: Getline/Variable/File-Footnote-1222577
+Node: Getline/Pipe222664
+Node: Getline/Variable/Pipe225224
+Node: Getline/Coprocess226331
+Node: Getline/Variable/Coprocess227574
+Node: Getline Notes228288
+Node: Getline Summary230230
+Ref: table-getline-variants230573
+Node: Command line directories231429
+Node: Printing232054
+Node: Print233685
+Node: Print Examples235022
+Node: Output Separators237806
+Node: OFMT239566
+Node: Printf240924
+Node: Basic Printf241830
+Node: Control Letters243369
+Node: Format Modifiers247181
+Node: Printf Examples253190
+Node: Redirection255905
+Node: Special Files262889
+Node: Special FD263422
+Ref: Special FD-Footnote-1267047
+Node: Special Network267121
+Node: Special Caveats267971
+Node: Close Files And Pipes268767
+Ref: Close Files And Pipes-Footnote-1275790
+Ref: Close Files And Pipes-Footnote-2275938
+Node: Expressions276088
+Node: Values277220
+Node: Constants277896
+Node: Scalar Constants278576
+Ref: Scalar Constants-Footnote-1279435
+Node: Nondecimal-numbers279617
+Node: Regexp Constants282676
+Node: Using Constant Regexps283151
+Node: Variables286206
+Node: Using Variables286861
+Node: Assignment Options288585
+Node: Conversion290457
+Ref: table-locale-affects295833
+Ref: Conversion-Footnote-1296457
+Node: All Operators296566
+Node: Arithmetic Ops297196
+Node: Concatenation299701
+Ref: Concatenation-Footnote-1302494
+Node: Assignment Ops302614
+Ref: table-assign-ops307602
+Node: Increment Ops309010
+Node: Truth Values and Conditions312480
+Node: Truth Values313563
+Node: Typing and Comparison314612
+Node: Variable Typing315401
+Ref: Variable Typing-Footnote-1319298
+Node: Comparison Operators319420
+Ref: table-relational-ops319830
+Node: POSIX String Comparison323379
+Ref: POSIX String Comparison-Footnote-1324335
+Node: Boolean Ops324473
+Ref: Boolean Ops-Footnote-1328551
+Node: Conditional Exp328642
+Node: Function Calls330374
+Node: Precedence333968
+Node: Locales337637
+Node: Patterns and Actions338726
+Node: Pattern Overview339780
+Node: Regexp Patterns341446
+Node: Expression Patterns341989
+Node: Ranges345674
+Node: BEGIN/END348640
+Node: Using BEGIN/END349402
+Ref: Using BEGIN/END-Footnote-1352133
+Node: I/O And BEGIN/END352239
+Node: BEGINFILE/ENDFILE354521
+Node: Empty357414
+Node: Using Shell Variables357730
+Node: Action Overview360015
+Node: Statements362372
+Node: If Statement364226
+Node: While Statement365725
+Node: Do Statement367769
+Node: For Statement368925
+Node: Switch Statement372077
+Node: Break Statement374174
+Node: Continue Statement376164
+Node: Next Statement377951
+Node: Nextfile Statement380341
+Node: Exit Statement382886
+Node: Built-in Variables385302
+Node: User-modified386397
+Ref: User-modified-Footnote-1394423
+Node: Auto-set394485
+Ref: Auto-set-Footnote-1403776
+Node: ARGC and ARGV403981
+Node: Arrays407832
+Node: Array Basics409337
+Node: Array Intro410048
+Node: Reference to Elements414366
+Node: Assigning Elements416636
+Node: Array Example417127
+Node: Scanning an Array418859
+Node: Delete421525
+Ref: Delete-Footnote-1423960
+Node: Numeric Array Subscripts424017
+Node: Uninitialized Subscripts426200
+Node: Multi-dimensional427828
+Node: Multi-scanning430922
+Node: Arrays of Arrays432506
+Node: Functions437083
+Node: Built-in437905
+Node: Calling Built-in438983
+Node: Numeric Functions440971
+Ref: Numeric Functions-Footnote-1444736
+Ref: Numeric Functions-Footnote-2445093
+Ref: Numeric Functions-Footnote-3445141
+Node: String Functions445410
+Ref: String Functions-Footnote-1468907
+Ref: String Functions-Footnote-2469036
+Ref: String Functions-Footnote-3469284
+Node: Gory Details469371
+Ref: table-sub-escapes471050
+Ref: table-sub-posix-92472404
+Ref: table-sub-proposed473747
+Ref: table-posix-sub475097
+Ref: table-gensub-escapes476643
+Ref: Gory Details-Footnote-1477850
+Ref: Gory Details-Footnote-2477901
+Node: I/O Functions478052
+Ref: I/O Functions-Footnote-1484707
+Node: Time Functions484854
+Ref: Time Functions-Footnote-1495746
+Ref: Time Functions-Footnote-2495814
+Ref: Time Functions-Footnote-3495972
+Ref: Time Functions-Footnote-4496083
+Ref: Time Functions-Footnote-5496195
+Ref: Time Functions-Footnote-6496422
+Node: Bitwise Functions496688
+Ref: table-bitwise-ops497246
+Ref: Bitwise Functions-Footnote-1501406
+Node: Type Functions501590
+Node: I18N Functions502060
+Node: User-defined503687
+Node: Definition Syntax504491
+Ref: Definition Syntax-Footnote-1509401
+Node: Function Example509470
+Node: Function Caveats512064
+Node: Calling A Function512485
+Node: Variable Scope513600
+Node: Pass By Value/Reference515575
+Node: Return Statement519015
+Node: Dynamic Typing521996
+Node: Indirect Calls522731
+Node: Internationalization532416
+Node: I18N and L10N533842
+Node: Explaining gettext534528
+Ref: Explaining gettext-Footnote-1539594
+Ref: Explaining gettext-Footnote-2539778
+Node: Programmer i18n539943
+Node: Translator i18n544143
+Node: String Extraction544936
+Ref: String Extraction-Footnote-1545897
+Node: Printf Ordering545983
+Ref: Printf Ordering-Footnote-1548767
+Node: I18N Portability548831
+Ref: I18N Portability-Footnote-1551280
+Node: I18N Example551343
+Ref: I18N Example-Footnote-1553978
+Node: Gawk I18N554050
+Node: Advanced Features554667
+Node: Nondecimal Data556180
+Node: Array Sorting557763
+Node: Controlling Array Traversal558463
+Node: Controlling Scanning With A Function559210
+Node: Controlling Scanning566913
+Ref: Controlling Scanning-Footnote-1570714
+Node: Array Sorting Functions571030
+Ref: Array Sorting Functions-Footnote-1574546
+Ref: Array Sorting Functions-Footnote-2574639
+Node: Two-way I/O574833
+Ref: Two-way I/O-Footnote-1580265
+Node: TCP/IP Networking580335
+Node: Profiling583179
+Node: Library Functions590653
+Ref: Library Functions-Footnote-1593660
+Node: Library Names593831
+Ref: Library Names-Footnote-1597302
+Ref: Library Names-Footnote-2597522
+Node: General Functions597608
+Node: Strtonum Function598561
+Node: Assert Function601491
+Node: Round Function604817
+Node: Cliff Random Function606360
+Node: Ordinal Functions607376
+Ref: Ordinal Functions-Footnote-1610446
+Ref: Ordinal Functions-Footnote-2610698
+Node: Join Function610907
+Ref: Join Function-Footnote-1612678
+Node: Gettimeofday Function612878
+Node: Data File Management616593
+Node: Filetrans Function617225
+Node: Rewind Function621364
+Node: File Checking622751
+Node: Empty Files623845
+Node: Ignoring Assigns626075
+Node: Getopt Function627628
+Ref: Getopt Function-Footnote-1638932
+Node: Passwd Functions639135
+Ref: Passwd Functions-Footnote-1648110
+Node: Group Functions648198
+Node: Walking Arrays656282
+Node: Sample Programs657851
+Node: Running Examples658516
+Node: Clones659244
+Node: Cut Program660468
+Node: Egrep Program670313
+Ref: Egrep Program-Footnote-1678086
+Node: Id Program678196
+Node: Split Program681812
+Ref: Split Program-Footnote-1685331
+Node: Tee Program685459
+Node: Uniq Program688262
+Node: Wc Program695691
+Ref: Wc Program-Footnote-1699957
+Ref: Wc Program-Footnote-2700157
+Node: Miscellaneous Programs700249
+Node: Dupword Program701437
+Node: Alarm Program703468
+Node: Translate Program708217
+Ref: Translate Program-Footnote-1712604
+Ref: Translate Program-Footnote-2712832
+Node: Labels Program712966
+Ref: Labels Program-Footnote-1716337
+Node: Word Sorting716421
+Node: History Sorting720305
+Node: Extract Program722144
+Ref: Extract Program-Footnote-1729627
+Node: Simple Sed729755
+Node: Igawk Program732817
+Ref: Igawk Program-Footnote-1747974
+Ref: Igawk Program-Footnote-2748175
+Node: Anagram Program748313
+Node: Signature Program751381
+Node: Debugger752481
+Node: Debugging753392
+Node: Debugging Concepts753805
+Node: Debugging Terms755661
+Node: Awk Debugging758284
+Node: Sample dgawk session759176
+Node: dgawk invocation759668
+Node: Finding The Bug760850
+Node: List of Debugger Commands767336
+Node: Breakpoint Control768647
+Node: Dgawk Execution Control772283
+Node: Viewing And Changing Data775634
+Node: Dgawk Stack778971
+Node: Dgawk Info780431
+Node: Miscellaneous Dgawk Commands784379
+Node: Readline Support789807
+Node: Dgawk Limitations790645
+Node: Language History792834
+Node: V7/SVR3.1794346
+Node: SVR4796667
+Node: POSIX798109
+Node: BTL799117
+Node: POSIX/GNU799851
+Node: Common Extensions805002
+Node: Ranges and Locales806109
+Ref: Ranges and Locales-Footnote-1810716
+Node: Contributors810937
+Node: Installation815199
+Node: Gawk Distribution816093
+Node: Getting816577
+Node: Extracting817403
+Node: Distribution contents819095
+Node: Unix Installation824317
+Node: Quick Installation824934
+Node: Additional Configuration Options826896
+Node: Configuration Philosophy828373
+Node: Non-Unix Installation830715
+Node: PC Installation831173
+Node: PC Binary Installation832472
+Node: PC Compiling834320
+Node: PC Testing837264
+Node: PC Using838440
+Node: Cygwin842625
+Node: MSYS843625
+Node: VMS Installation844139
+Node: VMS Compilation844742
+Ref: VMS Compilation-Footnote-1845749
+Node: VMS Installation Details845807
+Node: VMS Running847442
+Node: VMS Old Gawk849049
+Node: Bugs849523
+>>>>>>> gawk-4.0-stable
 Node: Other Versions853375
 Node: Notes858656
 Node: Compatibility Mode859348
@@ -27830,6 +28216,7 @@ Node: Adding Code862368
 Node: New Ports868335
 Node: Dynamic Extensions872448
 Node: Internals873824
+<<<<<<< HEAD
 Node: Plugin License882343
 Node: Sample Library882977
 Node: Internal File Description883663
@@ -27851,5 +28238,28 @@ Node: Glossary915086
 Node: Copying940062
 Node: GNU Free Documentation License977619
 Node: Index1002756
+=======
+Node: Plugin License882927
+Node: Sample Library883561
+Node: Internal File Description884247
+Node: Internal File Ops887962
+Ref: Internal File Ops-Footnote-1892743
+Node: Using Internal File Ops892883
+Node: Future Extensions895260
+Node: Basic Concepts897764
+Node: Basic High Level898521
+Ref: Basic High Level-Footnote-1902556
+Node: Basic Data Typing902741
+Node: Floating Point Issues907266
+Node: String Conversion Precision908349
+Ref: String Conversion Precision-Footnote-1910049
+Node: Unexpected Results910158
+Node: POSIX Floating Point Problems911984
+Ref: POSIX Floating Point Problems-Footnote-1915689
+Node: Glossary915727
+Node: Copying940703
+Node: GNU Free Documentation License978260
+Node: Index1003397
+>>>>>>> gawk-4.0-stable
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 17703504..fc569ffc 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -28173,6 +28173,7 @@ translation of @code{"\r\n"}, since it won't.  Caveat Emptor!
 
 @c based on material from Pat Rankin <rankin@eql.caltech.edu>
 @c now rankin@pactechdata.com
+@c now r.pat.rankin@gmail.com
 
 @cindex @command{gawk}, VMS version of
 @cindex installation, VMS
@@ -28453,7 +28454,7 @@ as follows:
 @item OS/2 @tab Andreas Buening, @EMAIL{andreas.buening@@nexgo.de,andreas dot buening at nexgo dot de}.
 
 @cindex Rankin, Pat
-@item VMS @tab Pat Rankin, @EMAIL{rankin@@pactechdata.com,rankin at pactechdata dot com}.
+@item VMS @tab Pat Rankin, @EMAIL{r.pat.rankin@@gmail.com,r.pat.rankin at gmail.com}
 
 @cindex Pitts, Dave
 @item z/OS (OS/390) @tab Dave Pitts, @EMAIL{dpitts@@cozx.com,dpitts at cozx dot com}.