|
| From: | Jim Meyering |
| Subject: | Changes to grep/manual/grep.txt,v |
| Date: | Mon, 3 Oct 2016 02:37:10 +0000 (UTC) |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 16/10/03 02:37:09
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- grep.txt 22 Apr 2016 05:25:53 -0000 1.24
+++ grep.txt 3 Oct 2016 02:37:08 -0000 1.25
@@ -30,7 +30,7 @@
âgrepâ prints lines that contain a match for a pattern.
- This manual is for version 2.25 of GNU Grep.
+ This manual is for version 2.26 of GNU Grep.
This manual is for âgrepâ, a pattern matching engine.
@@ -323,8 +323,10 @@
2.1.5 Context Line Control
--------------------------
-Regardless of how these options are set, âgrepâ will never print any
-given line more than once. If the â-oâ (â--only-matchingâ) option is
+âContext linesâ are non-matching lines that are near a matching line.
+They are output only if one of the following options are used.
+Regardless of how these options are set, âgrepâ never outputs any given
+line more than once. If the â-oâ (â--only-matchingâ) option is
specified, these options have no effect and a warning is given upon
their use.
@@ -387,17 +389,18 @@
Variables::), or null input bytes when the â-zâ (â--null-dataâ)
option is not given (*note Other Options::).
- By default, TYPE is âbinaryâ, and when âgrepâ discovers that a
file
- is binary it suppresses any further output, and instead outputs
- either a one-line message saying that a binary file matches, or no
- message if there is no match.
+ By default, TYPE is âbinaryâ, and âgrepâ suppresses output afer
+ null input binary data is discovered, and suppresses output lines
+ that contain improperly encoded data. When some output is
+ suppressed, âgrepâ follows any output with a one-line message
+ saying that a binary file matches.
- If TYPE is âwithout-matchâ, when âgrepâ discovers that a file is
- binary it assumes that the rest of the file does not match; this is
+ If TYPE is âwithout-matchâ, when âgrepâ discovers null input
binary
+ data it assumes that the rest of the file does not match; this is
equivalent to the â-Iâ option.
- If TYPE is âtextâ, âgrepâ processes a binary file as if it were
- text; this is equivalent to the â-aâ option.
+ If TYPE is âtextâ, âgrepâ processes binary data as if it were
text;
+ this is equivalent to the â-aâ option.
When TYPE is âbinaryâ, âgrepâ may treat non-text bytes as line
terminators even without the â-zâ (â--null-dataâ) option. This
@@ -1709,7 +1712,7 @@
Free Documentation License''.
If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the âwithâ¦Texts.â line with this:
+Texts, replace the âwith...Texts.â line with this:
with the Invariant Sections being LIST THEIR TITLES, with
the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -1730,17 +1733,17 @@
* Menu:
* *: Fundamental Structure.
- (line 789)
-* +: Fundamental Structure.
(line 792)
+* +: Fundamental Structure.
+ (line 795)
* --after-context: Context Line Control.
- (line 332)
-* --basic-regexp: grep Programs. (line 728)
+ (line 334)
+* --basic-regexp: grep Programs. (line 731)
* --before-context: Context Line Control.
- (line 336)
-* --binary: Other Options. (line 490)
+ (line 338)
+* --binary: Other Options. (line 493)
* --binary-files: File and Directory Selection.
- (line 382)
+ (line 384)
* --byte-offset: Output Line Prefix Control.
(line 262)
* --color: General Output Control.
@@ -1748,43 +1751,43 @@
* --colour: General Output Control.
(line 167)
* --context: Context Line Control.
- (line 341)
+ (line 343)
* --count: General Output Control.
(line 161)
* --dereference-recursive: File and Directory Selection.
- (line 478)
+ (line 481)
* --devices: File and Directory Selection.
- (line 420)
+ (line 423)
* --directories: File and Directory Selection.
- (line 431)
+ (line 434)
* --exclude: File and Directory Selection.
- (line 442)
+ (line 445)
* --exclude-dir: File and Directory Selection.
- (line 455)
+ (line 458)
* --exclude-from: File and Directory Selection.
- (line 451)
-* --extended-regexp: grep Programs. (line 733)
+ (line 454)
+* --extended-regexp: grep Programs. (line 736)
* --file: Matching Control. (line 108)
* --files-with-matches: General Output Control.
(line 188)
* --files-without-match: General Output Control.
(line 182)
-* --fixed-strings: grep Programs. (line 738)
+* --fixed-strings: grep Programs. (line 741)
* --group-separator: Context Line Control.
- (line 344)
+ (line 346)
* --group-separator <1>: Context Line Control.
- (line 348)
+ (line 350)
* --help: Generic Program Information.
(line 89)
* --ignore-case: Matching Control. (line 117)
* --include: File and Directory Selection.
- (line 465)
+ (line 468)
* --initial-tab: Output Line Prefix Control.
(line 293)
* --invert-match: Matching Control. (line 136)
* --label: Output Line Prefix Control.
(line 280)
-* --line-buffered: Other Options. (line 485)
+* --line-buffered: Other Options. (line 488)
* --line-number: Output Line Prefix Control.
(line 288)
* --line-regexp: Matching Control. (line 151)
@@ -1796,19 +1799,19 @@
(line 240)
* --null: Output Line Prefix Control.
(line 313)
-* --null-data: Other Options. (line 503)
+* --null-data: Other Options. (line 506)
* --only-matching: General Output Control.
(line 227)
-* --perl-regexp: grep Programs. (line 744)
+* --perl-regexp: grep Programs. (line 747)
* --quiet: General Output Control.
(line 233)
* --recursive: File and Directory Selection.
- (line 470)
+ (line 473)
* --regexp=PATTERN: Matching Control. (line 102)
* --silent: General Output Control.
(line 233)
* --text: File and Directory Selection.
- (line 378)
+ (line 380)
* --unix-byte-offsets: Output Line Prefix Control.
(line 303)
* --version: Generic Program Information.
@@ -1817,26 +1820,26 @@
(line 270)
* --word-regexp: Matching Control. (line 141)
* -A: Context Line Control.
- (line 332)
+ (line 334)
* -a: File and Directory Selection.
- (line 378)
+ (line 380)
* -b: Output Line Prefix Control.
(line 262)
* -B: Context Line Control.
- (line 336)
+ (line 338)
* -c: General Output Control.
(line 161)
* -C: Context Line Control.
- (line 341)
+ (line 343)
* -D: File and Directory Selection.
- (line 420)
+ (line 423)
* -d: File and Directory Selection.
- (line 431)
+ (line 434)
* -e: Matching Control. (line 102)
-* -E: grep Programs. (line 733)
+* -E: grep Programs. (line 736)
* -f: Matching Control. (line 108)
-* -F: grep Programs. (line 738)
-* -G: grep Programs. (line 728)
+* -F: grep Programs. (line 741)
+* -G: grep Programs. (line 731)
* -H: Output Line Prefix Control.
(line 270)
* -h: Output Line Prefix Control.
@@ -1851,23 +1854,23 @@
* -n: Output Line Prefix Control.
(line 288)
* -NUM: Context Line Control.
- (line 341)
+ (line 343)
* -o: General Output Control.
(line 227)
-* -P: grep Programs. (line 744)
+* -P: grep Programs. (line 747)
* -q: General Output Control.
(line 233)
* -r: File and Directory Selection.
- (line 470)
+ (line 473)
* -R: File and Directory Selection.
- (line 478)
+ (line 481)
* -s: General Output Control.
(line 240)
* -T: Output Line Prefix Control.
(line 293)
* -u: Output Line Prefix Control.
(line 303)
-* -U: Other Options. (line 490)
+* -U: Other Options. (line 493)
* -V: Generic Program Information.
(line 94)
* -v: Matching Control. (line 136)
@@ -1876,64 +1879,64 @@
* -y: Matching Control. (line 117)
* -Z: Output Line Prefix Control.
(line 313)
-* -z: Other Options. (line 503)
+* -z: Other Options. (line 506)
* .: Fundamental Structure.
- (line 783)
-* ?: Fundamental Structure.
(line 786)
+* ?: Fundamental Structure.
+ (line 789)
* _N_GNU_nonoption_argv_flags_ environment variable: Environment Variables.
- (line 698)
+ (line 701)
* {,M}: Fundamental Structure.
- (line 801)
+ (line 804)
* {N,M}: Fundamental Structure.
- (line 805)
+ (line 808)
* {N,}: Fundamental Structure.
- (line 798)
+ (line 801)
* {N}: Fundamental Structure.
- (line 795)
+ (line 798)
* after context: Context Line Control.
- (line 332)
+ (line 334)
* alnum character class: Character Classes and Bracket
Expressions.
- (line 848)
+ (line 851)
* alpha character class: Character Classes and Bracket
Expressions.
- (line 853)
+ (line 856)
* alphabetic characters: Character Classes and Bracket
Expressions.
- (line 853)
+ (line 856)
* alphanumeric characters: Character Classes and Bracket
Expressions.
- (line 848)
-* anchoring: Anchoring. (line 976)
+ (line 851)
+* anchoring: Anchoring. (line 979)
* asterisk: Fundamental Structure.
- (line 789)
+ (line 792)
* back-reference: Back-references and Subexpressions.
- (line 984)
+ (line 987)
* backslash: The Backslash Character and Special
Expressions.
- (line 943)
-* basic regular expressions: Basic vs Extended. (line 996)
+ (line 946)
+* basic regular expressions: Basic vs Extended. (line 999)
* before context: Context Line Control.
- (line 336)
+ (line 338)
* binary files: File and Directory Selection.
- (line 378)
+ (line 380)
* binary files <1>: File and Directory Selection.
- (line 382)
-* binary files, MS-DOS/MS-Windows: Other Options. (line 490)
+ (line 384)
+* binary files, MS-DOS/MS-Windows: Other Options. (line 493)
* blank character class: Character Classes and Bracket
Expressions.
- (line 858)
+ (line 861)
* blank characters: Character Classes and Bracket
Expressions.
- (line 858)
+ (line 861)
* bn GREP_COLORS capability: Environment Variables.
- (line 639)
+ (line 642)
* braces, first argument omitted: Fundamental Structure.
- (line 801)
+ (line 804)
* braces, one argument: Fundamental Structure.
- (line 795)
-* braces, second argument omitted: Fundamental Structure.
(line 798)
+* braces, second argument omitted: Fundamental Structure.
+ (line 801)
* braces, two arguments: Fundamental Structure.
- (line 805)
+ (line 808)
* bracket expression: Character Classes and Bracket
Expressions.
- (line 825)
-* Bugs, known: Reporting Bugs. (line 1218)
-* bugs, reporting: Reporting Bugs. (line 1210)
+ (line 828)
+* Bugs, known: Reporting Bugs. (line 1221)
+* bugs, reporting: Reporting Bugs. (line 1213)
* byte offset: Output Line Prefix Control.
(line 262)
* byte offsets, on MS-DOS/MS-Windows: Output Line Prefix Control.
@@ -1942,258 +1945,262 @@
* changing name of standard input: Output Line Prefix Control.
(line 280)
* character class: Character Classes and Bracket
Expressions.
- (line 825)
+ (line 828)
* character classes: Character Classes and Bracket
Expressions.
- (line 847)
+ (line 850)
* character type: Environment Variables.
- (line 666)
+ (line 669)
* classes of characters: Character Classes and Bracket
Expressions.
- (line 847)
+ (line 850)
* cntrl character class: Character Classes and Bracket
Expressions.
- (line 861)
-* context: Context Line Control.
- (line 341)
+ (line 864)
+* context lines: General Output Control.
+ (line 218)
+* context lines <1>: Context Line Control.
+ (line 325)
+* context lines <2>: Context Line Control.
+ (line 343)
* context lines, after match: Context Line Control.
- (line 332)
+ (line 334)
* context lines, before match: Context Line Control.
- (line 336)
+ (line 338)
* control characters: Character Classes and Bracket
Expressions.
- (line 861)
-* copying: Copying. (line 1228)
+ (line 864)
+* copying: Copying. (line 1231)
* counting lines: General Output Control.
(line 161)
* cx GREP_COLORS capability: Environment Variables.
- (line 590)
+ (line 593)
* default options environment variable: Environment Variables.
- (line 550)
+ (line 553)
* device search: File and Directory Selection.
- (line 420)
+ (line 423)
* digit character class: Character Classes and Bracket
Expressions.
- (line 866)
+ (line 869)
* digit characters: Character Classes and Bracket
Expressions.
- (line 866)
+ (line 869)
* directory search: File and Directory Selection.
- (line 431)
+ (line 434)
* dot: Fundamental Structure.
- (line 783)
+ (line 786)
* environment variables: Environment Variables.
- (line 549)
+ (line 552)
* exclude directories: File and Directory Selection.
- (line 455)
+ (line 458)
* exclude files: File and Directory Selection.
- (line 442)
+ (line 445)
* exclude files <1>: File and Directory Selection.
- (line 451)
-* exit status: Exit Status. (line 710)
-* FAQ about âgrepâ usage: Usage. (line 1026)
+ (line 454)
+* exit status: Exit Status. (line 713)
+* FAQ about grep usage: Usage. (line 1029)
* files which donât match: General Output Control.
(line 182)
* fn GREP_COLORS capability: Environment Variables.
- (line 629)
+ (line 632)
* fn GREP_COLORS capability <1>: Environment Variables.
- (line 644)
+ (line 647)
* graph character class: Character Classes and Bracket
Expressions.
- (line 869)
+ (line 872)
* graphic characters: Character Classes and Bracket
Expressions.
- (line 869)
-* âgrepâ programs: grep Programs. (line 719)
+ (line 872)
+* grep programs: grep Programs. (line 722)
* GREP_COLOR environment variable: Environment Variables.
- (line 563)
+ (line 566)
* GREP_COLORS environment variable: Environment Variables.
- (line 574)
+ (line 577)
* GREP_OPTIONS environment variable: Environment Variables.
- (line 550)
+ (line 553)
* group separator: Context Line Control.
- (line 344)
+ (line 346)
* group separator <1>: Context Line Control.
- (line 348)
+ (line 350)
* hexadecimal digits: Character Classes and Bracket
Expressions.
- (line 893)
+ (line 896)
* highlight markers: Environment Variables.
- (line 563)
+ (line 566)
* highlight markers <1>: Environment Variables.
- (line 574)
+ (line 577)
* highlight, color, colour: General Output Control.
(line 167)
* include files: File and Directory Selection.
- (line 465)
-* interval specifications: Basic vs Extended. (line 1000)
+ (line 468)
+* interval specifications: Basic vs Extended. (line 1003)
* invert matching: Matching Control. (line 136)
* LANG environment variable: Environment Variables.
- (line 514)
+ (line 517)
* LANG environment variable <1>: Environment Variables.
- (line 666)
+ (line 669)
* LANG environment variable <2>: Environment Variables.
- (line 673)
+ (line 676)
* LANG environment variable <3>: Environment Variables.
- (line 684)
+ (line 687)
* LANGUAGE environment variable: Environment Variables.
- (line 514)
+ (line 517)
* LANGUAGE environment variable <1>: Environment Variables.
- (line 684)
+ (line 687)
* language of messages: Environment Variables.
- (line 684)
+ (line 687)
* LC_ALL environment variable: Environment Variables.
- (line 514)
+ (line 517)
* LC_ALL environment variable <1>: Environment Variables.
- (line 666)
+ (line 669)
* LC_ALL environment variable <2>: Environment Variables.
- (line 673)
+ (line 676)
* LC_ALL environment variable <3>: Environment Variables.
- (line 684)
+ (line 687)
* LC_COLLATE environment variable: Environment Variables.
- (line 666)
+ (line 669)
* LC_CTYPE environment variable: Environment Variables.
- (line 673)
+ (line 676)
* LC_MESSAGES environment variable: Environment Variables.
- (line 514)
+ (line 517)
* LC_MESSAGES environment variable <1>: Environment Variables.
- (line 684)
-* line buffering: Other Options. (line 485)
+ (line 687)
+* line buffering: Other Options. (line 488)
* line numbering: Output Line Prefix Control.
(line 288)
* ln GREP_COLORS capability: Environment Variables.
- (line 634)
+ (line 637)
* lower character class: Character Classes and Bracket
Expressions.
- (line 872)
+ (line 875)
* lower-case letters: Character Classes and Bracket
Expressions.
- (line 872)
+ (line 875)
* match expression at most M times: Fundamental Structure.
- (line 801)
+ (line 804)
* match expression at most once: Fundamental Structure.
- (line 786)
+ (line 789)
* match expression from N to M times: Fundamental Structure.
- (line 805)
+ (line 808)
* match expression N or more times: Fundamental Structure.
- (line 798)
+ (line 801)
* match expression N times: Fundamental Structure.
- (line 795)
+ (line 798)
* match expression one or more times: Fundamental Structure.
- (line 792)
+ (line 795)
* match expression zero or more times: Fundamental Structure.
- (line 789)
+ (line 792)
* match the whole line: Matching Control. (line 151)
-* matching basic regular expressions: grep Programs. (line 728)
-* matching extended regular expressions: grep Programs. (line 733)
-* matching fixed strings: grep Programs. (line 738)
+* matching basic regular expressions: grep Programs. (line 731)
+* matching extended regular expressions: grep Programs. (line 736)
+* matching fixed strings: grep Programs. (line 741)
* matching Perl-compatible regular expressions: grep Programs.
- (line 744)
+ (line 747)
* matching whole words: Matching Control. (line 141)
* max-count: General Output Control.
(line 195)
* mc GREP_COLORS capability: Environment Variables.
- (line 621)
+ (line 624)
* message language: Environment Variables.
- (line 684)
+ (line 687)
* ms GREP_COLORS capability: Environment Variables.
- (line 613)
-* MS-DOS/MS-Windows binary files: Other Options. (line 490)
+ (line 616)
+* MS-DOS/MS-Windows binary files: Other Options. (line 493)
* MS-DOS/MS-Windows byte offsets: Output Line Prefix Control.
(line 303)
* mt GREP_COLORS capability: Environment Variables.
- (line 605)
+ (line 608)
* names of matching files: General Output Control.
(line 188)
* national language support: Environment Variables.
- (line 666)
+ (line 669)
* national language support <1>: Environment Variables.
- (line 684)
+ (line 687)
* ne GREP_COLORS capability: Environment Variables.
- (line 651)
+ (line 654)
* NLS: Environment Variables.
- (line 666)
+ (line 669)
* no filename prefix: Output Line Prefix Control.
(line 275)
* numeric characters: Character Classes and Bracket
Expressions.
- (line 866)
+ (line 869)
* only matching: General Output Control.
(line 227)
-* palindromes: Usage. (line 1148)
+* palindromes: Usage. (line 1151)
* pattern from file: Matching Control. (line 108)
* pattern list: Matching Control. (line 102)
* period: Fundamental Structure.
- (line 783)
+ (line 786)
* plus sign: Fundamental Structure.
- (line 792)
+ (line 795)
* POSIXLY_CORRECT environment variable: Environment Variables.
- (line 689)
+ (line 692)
* print character class: Character Classes and Bracket
Expressions.
- (line 876)
+ (line 879)
* print non-matching lines: Matching Control. (line 136)
* printable characters: Character Classes and Bracket
Expressions.
- (line 876)
-* punct character class: Character Classes and Bracket
Expressions.
(line 879)
+* punct character class: Character Classes and Bracket
Expressions.
+ (line 882)
* punctuation characters: Character Classes and Bracket
Expressions.
- (line 879)
+ (line 882)
* question mark: Fundamental Structure.
- (line 786)
+ (line 789)
* quiet, silent: General Output Control.
(line 233)
* range expression: Character Classes and Bracket
Expressions.
- (line 831)
+ (line 834)
* recursive search: File and Directory Selection.
- (line 470)
+ (line 473)
* recursive search <1>: File and Directory Selection.
- (line 478)
+ (line 481)
* regular expressions: Regular Expressions.
- (line 757)
-* return status: Exit Status. (line 710)
+ (line 760)
+* return status: Exit Status. (line 713)
* rv GREP_COLORS capability: Environment Variables.
- (line 599)
+ (line 602)
* searching directory trees: File and Directory Selection.
- (line 442)
+ (line 445)
* searching directory trees <1>: File and Directory Selection.
- (line 451)
+ (line 454)
* searching directory trees <2>: File and Directory Selection.
- (line 465)
+ (line 468)
* searching directory trees <3>: File and Directory Selection.
- (line 470)
+ (line 473)
* searching directory trees <4>: File and Directory Selection.
- (line 478)
+ (line 481)
* searching for a pattern: Introduction. (line 48)
* sl GREP_COLORS capability: Environment Variables.
- (line 582)
+ (line 585)
* space character class: Character Classes and Bracket
Expressions.
- (line 884)
+ (line 887)
* space characters: Character Classes and Bracket
Expressions.
- (line 884)
+ (line 887)
* subexpression: Back-references and Subexpressions.
- (line 984)
+ (line 987)
* suppress binary data: File and Directory Selection.
- (line 378)
+ (line 380)
* suppress error messages: General Output Control.
(line 240)
* symbolic links: File and Directory Selection.
- (line 431)
+ (line 434)
* symbolic links <1>: File and Directory Selection.
- (line 470)
+ (line 473)
* symbolic links <2>: File and Directory Selection.
- (line 478)
+ (line 481)
* tab-aligned content lines: Output Line Prefix Control.
(line 293)
* translation of message language: Environment Variables.
- (line 684)
+ (line 687)
* upper character class: Character Classes and Bracket
Expressions.
- (line 889)
+ (line 892)
* upper-case letters: Character Classes and Bracket
Expressions.
- (line 889)
+ (line 892)
* usage summary, printing: Generic Program Information.
(line 89)
-* usage, examples: Usage. (line 1015)
-* using âgrepâ, Q&A: Usage. (line 1026)
-* variants of âgrepâ: grep Programs. (line 719)
+* usage, examples: Usage. (line 1018)
+* using grep, Q&A: Usage. (line 1029)
+* variants of grep: grep Programs. (line 722)
* version, printing: Generic Program Information.
(line 94)
* whitespace characters: Character Classes and Bracket
Expressions.
- (line 884)
+ (line 887)
* with filename prefix: Output Line Prefix Control.
(line 270)
* xdigit character class: Character Classes and Bracket
Expressions.
- (line 893)
+ (line 896)
* xdigit class: Character Classes and Bracket
Expressions.
- (line 893)
+ (line 896)
* zero-terminated file names: Output Line Prefix Control.
(line 313)
-* zero-terminated lines: Other Options. (line 503)
+* zero-terminated lines: Other Options. (line 506)
| [Prev in Thread] | Current Thread | [Next in Thread] |