|
| From: | Jim Meyering |
| Subject: | Changes to grep/manual/grep.txt,v |
| Date: | Wed, 7 Dec 2016 13:11:26 +0000 (UTC) |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 16/12/07 13:11:25
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- grep.txt 3 Oct 2016 02:37:08 -0000 1.25
+++ grep.txt 7 Dec 2016 13:11:21 -0000 1.26
@@ -30,7 +30,7 @@
âgrepâ prints lines that contain a match for a pattern.
- This manual is for version 2.26 of GNU Grep.
+ This manual is for version 2.27 of GNU Grep.
This manual is for âgrepâ, a pattern matching engine.
@@ -226,7 +226,9 @@
â-oâ
â--only-matchingâ
Print only the matched (non-empty) parts of matching lines, with
- each such part on a separate output line.
+ each such part on a separate output line. Output lines use the
+ same delimiters as input, and delimiters are null bytes if â-zâ
+ (â--null-dataâ) is also used (*note Other Options::).
â-qâ
â--quietâ
@@ -294,10 +296,9 @@
Make sure that the first character of actual line content lies on a
tab stop, so that the alignment of tabs looks normal. This is
useful with options that prefix their output to the actual content:
- â-Hâ, â-nâ, and â-bâ. In order to improve the probability
that
- lines from a single file will all start at the same column, this
- also causes the line number and byte offset (if present) to be
- printed in a minimum-size field width.
+ â-Hâ, â-nâ, and â-bâ. This may also prepend spaces to output
line
+ numbers and byte offsets so that lines from a single file all start
+ at the same column.
â-uâ
â--unix-byte-offsetsâ
@@ -746,8 +747,9 @@
â-Pâ
â--perl-regexpâ
Interpret the pattern as a Perl-compatible regular expression
- (PCRE). This is highly experimental and âgrep -Pâ may warn of
- unimplemented features.
+ (PCRE). This is highly experimental, particularly when combined
+ with the â-zâ (â--null-dataâ) option, and âgrep -Pâ may warn
of
+ unimplemented features. *Note Other Options::.
In addition, two variant programs âegrepâ and âfgrepâ are available.
âegrepâ is the same as âgrep -Eâ. âfgrepâ is the same as âgrep
-Fâ.
@@ -1183,10 +1185,10 @@
Therefore, merely using the â[:space:]â character class does not
match newlines in the way you might expect.
- With the GNU âgrepâ option â-zâ (â--null-dataâ), each input
âlineâ
- is terminated by a null byte; *note Other Options::. Thus, you can
- match newlines in the input, but typically if there is a match the
- entire input is output, so this usage is often combined with
+ With the GNU âgrepâ option â-zâ (â--null-dataâ), each input
and
+ output âlineâ is null-terminated; *note Other Options::. Thus, you
+ can match newlines in the input, but typically if there is a match
+ the entire input is output, so this usage is often combined with
output-suppressing options like â-qâ, e.g.:
printf 'foo\nbar\n' | grep -z -q 'foo[[:space:]]\+bar'
@@ -1733,117 +1735,117 @@
* Menu:
* *: Fundamental Structure.
- (line 792)
+ (line 794)
* +: Fundamental Structure.
- (line 795)
+ (line 797)
* --after-context: Context Line Control.
- (line 334)
-* --basic-regexp: grep Programs. (line 731)
+ (line 335)
+* --basic-regexp: grep Programs. (line 732)
* --before-context: Context Line Control.
- (line 338)
-* --binary: Other Options. (line 493)
+ (line 339)
+* --binary: Other Options. (line 494)
* --binary-files: File and Directory Selection.
- (line 384)
+ (line 385)
* --byte-offset: Output Line Prefix Control.
- (line 262)
+ (line 264)
* --color: General Output Control.
(line 167)
* --colour: General Output Control.
(line 167)
* --context: Context Line Control.
- (line 343)
+ (line 344)
* --count: General Output Control.
(line 161)
* --dereference-recursive: File and Directory Selection.
- (line 481)
+ (line 482)
* --devices: File and Directory Selection.
- (line 423)
+ (line 424)
* --directories: File and Directory Selection.
- (line 434)
+ (line 435)
* --exclude: File and Directory Selection.
- (line 445)
+ (line 446)
* --exclude-dir: File and Directory Selection.
- (line 458)
+ (line 459)
* --exclude-from: File and Directory Selection.
- (line 454)
-* --extended-regexp: grep Programs. (line 736)
+ (line 455)
+* --extended-regexp: grep Programs. (line 737)
* --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 741)
+* --fixed-strings: grep Programs. (line 742)
* --group-separator: Context Line Control.
- (line 346)
+ (line 347)
* --group-separator <1>: Context Line Control.
- (line 350)
+ (line 351)
* --help: Generic Program Information.
(line 89)
* --ignore-case: Matching Control. (line 117)
* --include: File and Directory Selection.
- (line 468)
+ (line 469)
* --initial-tab: Output Line Prefix Control.
- (line 293)
+ (line 295)
* --invert-match: Matching Control. (line 136)
* --label: Output Line Prefix Control.
- (line 280)
-* --line-buffered: Other Options. (line 488)
+ (line 282)
+* --line-buffered: Other Options. (line 489)
* --line-number: Output Line Prefix Control.
- (line 288)
+ (line 290)
* --line-regexp: Matching Control. (line 151)
* --max-count: General Output Control.
(line 195)
* --no-filename: Output Line Prefix Control.
- (line 275)
+ (line 277)
* --no-messages: General Output Control.
- (line 240)
+ (line 242)
* --null: Output Line Prefix Control.
- (line 313)
-* --null-data: Other Options. (line 506)
+ (line 314)
+* --null-data: Other Options. (line 507)
* --only-matching: General Output Control.
(line 227)
-* --perl-regexp: grep Programs. (line 747)
+* --perl-regexp: grep Programs. (line 748)
* --quiet: General Output Control.
- (line 233)
+ (line 235)
* --recursive: File and Directory Selection.
- (line 473)
+ (line 474)
* --regexp=PATTERN: Matching Control. (line 102)
* --silent: General Output Control.
- (line 233)
+ (line 235)
* --text: File and Directory Selection.
- (line 380)
+ (line 381)
* --unix-byte-offsets: Output Line Prefix Control.
- (line 303)
+ (line 304)
* --version: Generic Program Information.
(line 94)
* --with-filename: Output Line Prefix Control.
- (line 270)
+ (line 272)
* --word-regexp: Matching Control. (line 141)
* -A: Context Line Control.
- (line 334)
+ (line 335)
* -a: File and Directory Selection.
- (line 380)
+ (line 381)
* -b: Output Line Prefix Control.
- (line 262)
+ (line 264)
* -B: Context Line Control.
- (line 338)
+ (line 339)
* -c: General Output Control.
(line 161)
* -C: Context Line Control.
- (line 343)
+ (line 344)
* -D: File and Directory Selection.
- (line 423)
+ (line 424)
* -d: File and Directory Selection.
- (line 434)
+ (line 435)
* -e: Matching Control. (line 102)
-* -E: grep Programs. (line 736)
+* -E: grep Programs. (line 737)
* -f: Matching Control. (line 108)
-* -F: grep Programs. (line 741)
-* -G: grep Programs. (line 731)
+* -F: grep Programs. (line 742)
+* -G: grep Programs. (line 732)
* -H: Output Line Prefix Control.
- (line 270)
+ (line 272)
* -h: Output Line Prefix Control.
- (line 275)
+ (line 277)
* -i: Matching Control. (line 117)
* -L: General Output Control.
(line 182)
@@ -1852,25 +1854,25 @@
* -m: General Output Control.
(line 195)
* -n: Output Line Prefix Control.
- (line 288)
+ (line 290)
* -NUM: Context Line Control.
- (line 343)
+ (line 344)
* -o: General Output Control.
(line 227)
-* -P: grep Programs. (line 747)
+* -P: grep Programs. (line 748)
* -q: General Output Control.
- (line 233)
+ (line 235)
* -r: File and Directory Selection.
- (line 473)
+ (line 474)
* -R: File and Directory Selection.
- (line 481)
+ (line 482)
* -s: General Output Control.
- (line 240)
+ (line 242)
* -T: Output Line Prefix Control.
- (line 293)
+ (line 295)
* -u: Output Line Prefix Control.
- (line 303)
-* -U: Other Options. (line 493)
+ (line 304)
+* -U: Other Options. (line 494)
* -V: Generic Program Information.
(line 94)
* -v: Matching Control. (line 136)
@@ -1878,329 +1880,329 @@
* -x: Matching Control. (line 151)
* -y: Matching Control. (line 117)
* -Z: Output Line Prefix Control.
- (line 313)
-* -z: Other Options. (line 506)
+ (line 314)
+* -z: Other Options. (line 507)
* .: Fundamental Structure.
- (line 786)
+ (line 788)
* ?: Fundamental Structure.
- (line 789)
+ (line 791)
* _N_GNU_nonoption_argv_flags_ environment variable: Environment Variables.
- (line 701)
+ (line 702)
* {,M}: Fundamental Structure.
- (line 804)
+ (line 806)
* {N,M}: Fundamental Structure.
- (line 808)
+ (line 810)
* {N,}: Fundamental Structure.
- (line 801)
+ (line 803)
* {N}: Fundamental Structure.
- (line 798)
+ (line 800)
* after context: Context Line Control.
- (line 334)
+ (line 335)
* alnum character class: Character Classes and Bracket
Expressions.
- (line 851)
+ (line 853)
* alpha character class: Character Classes and Bracket
Expressions.
- (line 856)
+ (line 858)
* alphabetic characters: Character Classes and Bracket
Expressions.
- (line 856)
+ (line 858)
* alphanumeric characters: Character Classes and Bracket
Expressions.
- (line 851)
-* anchoring: Anchoring. (line 979)
+ (line 853)
+* anchoring: Anchoring. (line 981)
* asterisk: Fundamental Structure.
- (line 792)
+ (line 794)
* back-reference: Back-references and Subexpressions.
- (line 987)
+ (line 989)
* backslash: The Backslash Character and Special
Expressions.
- (line 946)
-* basic regular expressions: Basic vs Extended. (line 999)
+ (line 948)
+* basic regular expressions: Basic vs Extended. (line 1001)
* before context: Context Line Control.
- (line 338)
+ (line 339)
* binary files: File and Directory Selection.
- (line 380)
+ (line 381)
* binary files <1>: File and Directory Selection.
- (line 384)
-* binary files, MS-DOS/MS-Windows: Other Options. (line 493)
+ (line 385)
+* binary files, MS-DOS/MS-Windows: Other Options. (line 494)
* blank character class: Character Classes and Bracket
Expressions.
- (line 861)
+ (line 863)
* blank characters: Character Classes and Bracket
Expressions.
- (line 861)
+ (line 863)
* bn GREP_COLORS capability: Environment Variables.
- (line 642)
+ (line 643)
* braces, first argument omitted: Fundamental Structure.
- (line 804)
+ (line 806)
* braces, one argument: Fundamental Structure.
- (line 798)
+ (line 800)
* braces, second argument omitted: Fundamental Structure.
- (line 801)
+ (line 803)
* braces, two arguments: Fundamental Structure.
- (line 808)
+ (line 810)
* bracket expression: Character Classes and Bracket
Expressions.
- (line 828)
-* Bugs, known: Reporting Bugs. (line 1221)
-* bugs, reporting: Reporting Bugs. (line 1213)
+ (line 830)
+* Bugs, known: Reporting Bugs. (line 1223)
+* bugs, reporting: Reporting Bugs. (line 1215)
* byte offset: Output Line Prefix Control.
- (line 262)
+ (line 264)
* byte offsets, on MS-DOS/MS-Windows: Output Line Prefix Control.
- (line 303)
+ (line 304)
* case insensitive search: Matching Control. (line 117)
* changing name of standard input: Output Line Prefix Control.
- (line 280)
+ (line 282)
* character class: Character Classes and Bracket
Expressions.
- (line 828)
+ (line 830)
* character classes: Character Classes and Bracket
Expressions.
- (line 850)
+ (line 852)
* character type: Environment Variables.
- (line 669)
+ (line 670)
* classes of characters: Character Classes and Bracket
Expressions.
- (line 850)
+ (line 852)
* cntrl character class: Character Classes and Bracket
Expressions.
- (line 864)
+ (line 866)
* context lines: General Output Control.
(line 218)
* context lines <1>: Context Line Control.
- (line 325)
+ (line 326)
* context lines <2>: Context Line Control.
- (line 343)
+ (line 344)
* context lines, after match: Context Line Control.
- (line 334)
+ (line 335)
* context lines, before match: Context Line Control.
- (line 338)
+ (line 339)
* control characters: Character Classes and Bracket
Expressions.
- (line 864)
-* copying: Copying. (line 1231)
+ (line 866)
+* copying: Copying. (line 1233)
* counting lines: General Output Control.
(line 161)
* cx GREP_COLORS capability: Environment Variables.
- (line 593)
+ (line 594)
* default options environment variable: Environment Variables.
- (line 553)
+ (line 554)
* device search: File and Directory Selection.
- (line 423)
+ (line 424)
* digit character class: Character Classes and Bracket
Expressions.
- (line 869)
+ (line 871)
* digit characters: Character Classes and Bracket
Expressions.
- (line 869)
+ (line 871)
* directory search: File and Directory Selection.
- (line 434)
+ (line 435)
* dot: Fundamental Structure.
- (line 786)
+ (line 788)
* environment variables: Environment Variables.
- (line 552)
+ (line 553)
* exclude directories: File and Directory Selection.
- (line 458)
+ (line 459)
* exclude files: File and Directory Selection.
- (line 445)
+ (line 446)
* exclude files <1>: File and Directory Selection.
- (line 454)
-* exit status: Exit Status. (line 713)
-* FAQ about grep usage: Usage. (line 1029)
+ (line 455)
+* exit status: Exit Status. (line 714)
+* FAQ about grep usage: Usage. (line 1031)
* files which donât match: General Output Control.
(line 182)
* fn GREP_COLORS capability: Environment Variables.
- (line 632)
+ (line 633)
* fn GREP_COLORS capability <1>: Environment Variables.
- (line 647)
+ (line 648)
* graph character class: Character Classes and Bracket
Expressions.
- (line 872)
+ (line 874)
* graphic characters: Character Classes and Bracket
Expressions.
- (line 872)
-* grep programs: grep Programs. (line 722)
+ (line 874)
+* grep programs: grep Programs. (line 723)
* GREP_COLOR environment variable: Environment Variables.
- (line 566)
+ (line 567)
* GREP_COLORS environment variable: Environment Variables.
- (line 577)
+ (line 578)
* GREP_OPTIONS environment variable: Environment Variables.
- (line 553)
+ (line 554)
* group separator: Context Line Control.
- (line 346)
+ (line 347)
* group separator <1>: Context Line Control.
- (line 350)
+ (line 351)
* hexadecimal digits: Character Classes and Bracket
Expressions.
- (line 896)
+ (line 898)
* highlight markers: Environment Variables.
- (line 566)
+ (line 567)
* highlight markers <1>: Environment Variables.
- (line 577)
+ (line 578)
* highlight, color, colour: General Output Control.
(line 167)
* include files: File and Directory Selection.
- (line 468)
-* interval specifications: Basic vs Extended. (line 1003)
+ (line 469)
+* interval specifications: Basic vs Extended. (line 1005)
* invert matching: Matching Control. (line 136)
* LANG environment variable: Environment Variables.
- (line 517)
+ (line 518)
* LANG environment variable <1>: Environment Variables.
- (line 669)
+ (line 670)
* LANG environment variable <2>: Environment Variables.
- (line 676)
+ (line 677)
* LANG environment variable <3>: Environment Variables.
- (line 687)
+ (line 688)
* LANGUAGE environment variable: Environment Variables.
- (line 517)
+ (line 518)
* LANGUAGE environment variable <1>: Environment Variables.
- (line 687)
+ (line 688)
* language of messages: Environment Variables.
- (line 687)
+ (line 688)
* LC_ALL environment variable: Environment Variables.
- (line 517)
+ (line 518)
* LC_ALL environment variable <1>: Environment Variables.
- (line 669)
+ (line 670)
* LC_ALL environment variable <2>: Environment Variables.
- (line 676)
+ (line 677)
* LC_ALL environment variable <3>: Environment Variables.
- (line 687)
+ (line 688)
* LC_COLLATE environment variable: Environment Variables.
- (line 669)
+ (line 670)
* LC_CTYPE environment variable: Environment Variables.
- (line 676)
+ (line 677)
* LC_MESSAGES environment variable: Environment Variables.
- (line 517)
+ (line 518)
* LC_MESSAGES environment variable <1>: Environment Variables.
- (line 687)
-* line buffering: Other Options. (line 488)
+ (line 688)
+* line buffering: Other Options. (line 489)
* line numbering: Output Line Prefix Control.
- (line 288)
+ (line 290)
* ln GREP_COLORS capability: Environment Variables.
- (line 637)
+ (line 638)
* lower character class: Character Classes and Bracket
Expressions.
- (line 875)
+ (line 877)
* lower-case letters: Character Classes and Bracket
Expressions.
- (line 875)
+ (line 877)
* match expression at most M times: Fundamental Structure.
- (line 804)
+ (line 806)
* match expression at most once: Fundamental Structure.
- (line 789)
+ (line 791)
* match expression from N to M times: Fundamental Structure.
- (line 808)
+ (line 810)
* match expression N or more times: Fundamental Structure.
- (line 801)
+ (line 803)
* match expression N times: Fundamental Structure.
- (line 798)
+ (line 800)
* match expression one or more times: Fundamental Structure.
- (line 795)
+ (line 797)
* match expression zero or more times: Fundamental Structure.
- (line 792)
+ (line 794)
* match the whole line: Matching Control. (line 151)
-* matching basic regular expressions: grep Programs. (line 731)
-* matching extended regular expressions: grep Programs. (line 736)
-* matching fixed strings: grep Programs. (line 741)
+* matching basic regular expressions: grep Programs. (line 732)
+* matching extended regular expressions: grep Programs. (line 737)
+* matching fixed strings: grep Programs. (line 742)
* matching Perl-compatible regular expressions: grep Programs.
- (line 747)
+ (line 748)
* matching whole words: Matching Control. (line 141)
* max-count: General Output Control.
(line 195)
* mc GREP_COLORS capability: Environment Variables.
- (line 624)
+ (line 625)
* message language: Environment Variables.
- (line 687)
+ (line 688)
* ms GREP_COLORS capability: Environment Variables.
- (line 616)
-* MS-DOS/MS-Windows binary files: Other Options. (line 493)
+ (line 617)
+* MS-DOS/MS-Windows binary files: Other Options. (line 494)
* MS-DOS/MS-Windows byte offsets: Output Line Prefix Control.
- (line 303)
+ (line 304)
* mt GREP_COLORS capability: Environment Variables.
- (line 608)
+ (line 609)
* names of matching files: General Output Control.
(line 188)
* national language support: Environment Variables.
- (line 669)
+ (line 670)
* national language support <1>: Environment Variables.
- (line 687)
+ (line 688)
* ne GREP_COLORS capability: Environment Variables.
- (line 654)
+ (line 655)
* NLS: Environment Variables.
- (line 669)
+ (line 670)
* no filename prefix: Output Line Prefix Control.
- (line 275)
+ (line 277)
* numeric characters: Character Classes and Bracket
Expressions.
- (line 869)
+ (line 871)
* only matching: General Output Control.
(line 227)
-* palindromes: Usage. (line 1151)
+* palindromes: Usage. (line 1153)
* pattern from file: Matching Control. (line 108)
* pattern list: Matching Control. (line 102)
* period: Fundamental Structure.
- (line 786)
+ (line 788)
* plus sign: Fundamental Structure.
- (line 795)
+ (line 797)
* POSIXLY_CORRECT environment variable: Environment Variables.
- (line 692)
+ (line 693)
* print character class: Character Classes and Bracket
Expressions.
- (line 879)
+ (line 881)
* print non-matching lines: Matching Control. (line 136)
* printable characters: Character Classes and Bracket
Expressions.
- (line 879)
+ (line 881)
* punct character class: Character Classes and Bracket
Expressions.
- (line 882)
+ (line 884)
* punctuation characters: Character Classes and Bracket
Expressions.
- (line 882)
+ (line 884)
* question mark: Fundamental Structure.
- (line 789)
+ (line 791)
* quiet, silent: General Output Control.
- (line 233)
+ (line 235)
* range expression: Character Classes and Bracket
Expressions.
- (line 834)
+ (line 836)
* recursive search: File and Directory Selection.
- (line 473)
+ (line 474)
* recursive search <1>: File and Directory Selection.
- (line 481)
+ (line 482)
* regular expressions: Regular Expressions.
- (line 760)
-* return status: Exit Status. (line 713)
+ (line 762)
+* return status: Exit Status. (line 714)
* rv GREP_COLORS capability: Environment Variables.
- (line 602)
+ (line 603)
* searching directory trees: File and Directory Selection.
- (line 445)
+ (line 446)
* searching directory trees <1>: File and Directory Selection.
- (line 454)
+ (line 455)
* searching directory trees <2>: File and Directory Selection.
- (line 468)
+ (line 469)
* searching directory trees <3>: File and Directory Selection.
- (line 473)
+ (line 474)
* searching directory trees <4>: File and Directory Selection.
- (line 481)
+ (line 482)
* searching for a pattern: Introduction. (line 48)
* sl GREP_COLORS capability: Environment Variables.
- (line 585)
+ (line 586)
* space character class: Character Classes and Bracket
Expressions.
- (line 887)
+ (line 889)
* space characters: Character Classes and Bracket
Expressions.
- (line 887)
+ (line 889)
* subexpression: Back-references and Subexpressions.
- (line 987)
+ (line 989)
* suppress binary data: File and Directory Selection.
- (line 380)
+ (line 381)
* suppress error messages: General Output Control.
- (line 240)
+ (line 242)
* symbolic links: File and Directory Selection.
- (line 434)
+ (line 435)
* symbolic links <1>: File and Directory Selection.
- (line 473)
+ (line 474)
* symbolic links <2>: File and Directory Selection.
- (line 481)
+ (line 482)
* tab-aligned content lines: Output Line Prefix Control.
- (line 293)
+ (line 295)
* translation of message language: Environment Variables.
- (line 687)
+ (line 688)
* upper character class: Character Classes and Bracket
Expressions.
- (line 892)
+ (line 894)
* upper-case letters: Character Classes and Bracket
Expressions.
- (line 892)
+ (line 894)
* usage summary, printing: Generic Program Information.
(line 89)
-* usage, examples: Usage. (line 1018)
-* using grep, Q&A: Usage. (line 1029)
-* variants of grep: grep Programs. (line 722)
+* usage, examples: Usage. (line 1020)
+* using grep, Q&A: Usage. (line 1031)
+* variants of grep: grep Programs. (line 723)
* version, printing: Generic Program Information.
(line 94)
* whitespace characters: Character Classes and Bracket
Expressions.
- (line 887)
+ (line 889)
* with filename prefix: Output Line Prefix Control.
- (line 270)
+ (line 272)
* xdigit character class: Character Classes and Bracket
Expressions.
- (line 896)
+ (line 898)
* xdigit class: Character Classes and Bracket
Expressions.
- (line 896)
+ (line 898)
* zero-terminated file names: Output Line Prefix Control.
- (line 313)
-* zero-terminated lines: Other Options. (line 506)
+ (line 314)
+* zero-terminated lines: Other Options. (line 507)
| [Prev in Thread] | Current Thread | [Next in Thread] |