[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to grep/manual/grep.txt,v
|
From: |
Jim Meyering |
|
Subject: |
Changes to grep/manual/grep.txt,v |
|
Date: |
Mon, 02 Nov 2015 02:54:43 +0000 |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 15/11/02 02:54:37
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- grep.txt 23 Nov 2014 22:23:29 -0000 1.20
+++ grep.txt 2 Nov 2015 02:54:30 -0000 1.21
@@ -35,11 +35,11 @@
`grep' prints lines that contain a match for a pattern.
- This manual is for version 2.21 of GNU Grep.
+ This manual is for version 2.22 of GNU Grep.
This manual is for `grep', a pattern matching engine.
- Copyright (C) 1999-2002, 2005, 2008-2014 Free Software Foundation,
+ Copyright (C) 1999-2002, 2005, 2008-2015 Free Software Foundation,
Inc.
Permission is granted to copy, distribute and/or modify this
@@ -389,11 +389,18 @@
`--binary-files=TYPE'
If a file's allocation metadata, or if its data read before a line
is selected for output, indicate that the file contains binary
- data, assume that the file is of type TYPE. By default, TYPE is
- `binary', and `grep' normally outputs either a one-line message
- saying that a binary file matches, or no message if there is no
- match. When matching binary data, `grep' may treat non-text bytes
- as line terminators.
+ data, assume that the file is of type TYPE. Non-text bytes
+ indicate binary data; these are either data bytes improperly
+ encoded for the current locale, or null bytes when the `-z'
+ (`--null-data') option is not given (*note Other Options::).
+
+ By default, TYPE is `binary', and `grep' normally outputs either a
+ one-line message saying that a binary file matches, or no message
+ if there is no match. When processing binary data, `grep' may
+ treat non-text bytes as line terminators; for example, the pattern
+ `.' (period) might not match a null byte, as the null byte might
+ be treated as a line terminator even without the `-z'
+ (`--null-data') option.
If TYPE is `without-match', `grep' assumes that a binary file does
not match; this is equivalent to the `-I' option.
@@ -457,8 +464,9 @@
`--recursive'
For each directory operand, read and process all files in that
directory, recursively. Follow symbolic links on the command
- line, but skip symlinks that are encountered recursively. This is
- the same as the `--directories=recurse' option.
+ line, but skip symlinks that are encountered recursively. Note
+ that if no file operand is given, grep searches the working
+ directory. This is the same as the `--directories=recurse' option.
`-R'
`--dereference-recursive'
@@ -539,7 +547,13 @@
any explicit options. As this causes problems when writing
portable scripts, this feature will be removed in a future release
of `grep', and `grep' warns if it is used. Please use an alias or
- script instead.
+ script instead. For example, if `grep' is in the directory
+ `/usr/bin' you can prepend `$HOME/bin' to your `PATH' and create an
+ executable script `$HOME/bin/grep' containing the following:
+
+ #! /bin/sh
+ export PATH=/usr/bin
+ exec grep --color=auto --devices=skip "$@"
`GREP_COLOR'
This variable specifies the color used to highlight matched
@@ -1166,8 +1180,8 @@
Therefore, merely using the `[:space:]' character class does not
match newlines in the way you might expect.
- With the GNU `grep' option `-z' (*note File and Directory
- Selection::), the input is terminated by null bytes. Thus, you
+ 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
output-suppressing options like `-q', e.g.:
@@ -1719,48 +1733,48 @@
Index
*****
-*: See 3.1. (line 770)
-+: See 3.1. (line 773)
+*: See 3.1. (line 784)
++: See 3.1. (line 787)
--after-context: See 2.1.5. (line 339)
---basic-regexp: See 2.4. (line 709)
+--basic-regexp: See 2.4. (line 723)
--before-context: See 2.1.5. (line 343)
---binary: See 2.1.7. (line 478)
+--binary: See 2.1.7. (line 486)
--binary-files: See 2.1.6. (line 390)
--byte-offset: See 2.1.4. (line 268)
--color: See 2.1.3. (line 171)
--colour: See 2.1.3. (line 171)
--context: See 2.1.5. (line 348)
--count: See 2.1.3. (line 165)
---dereference-recursive: See 2.1.6. (line 465)
---devices: See 2.1.6. (line 410)
---directories: See 2.1.6. (line 422)
---exclude: See 2.1.6. (line 433)
---exclude-dir: See 2.1.6. (line 444)
---exclude-from: See 2.1.6. (line 440)
---extended-regexp: See 2.4. (line 714)
+--dereference-recursive: See 2.1.6. (line 473)
+--devices: See 2.1.6. (line 417)
+--directories: See 2.1.6. (line 429)
+--exclude: See 2.1.6. (line 440)
+--exclude-dir: See 2.1.6. (line 451)
+--exclude-from: See 2.1.6. (line 447)
+--extended-regexp: See 2.4. (line 728)
--file: See 2.1.2. (line 116)
--files-with-matches: See 2.1.3. (line 192)
--files-without-match: See 2.1.3. (line 186)
---fixed-strings: See 2.4. (line 719)
+--fixed-strings: See 2.4. (line 733)
--group-separator: See 2.1.5. (line 351)
--help: See 2.1.1. (line 96)
--ignore-case: See 2.1.2. (line 123)
---include: See 2.1.6. (line 453)
+--include: See 2.1.6. (line 460)
--initial-tab: See 2.1.4. (line 299)
--invert-match: See 2.1.2. (line 142)
--label: See 2.1.4. (line 286)
---line-buffered: See 2.1.7. (line 473)
+--line-buffered: See 2.1.7. (line 481)
--line-number: See 2.1.4. (line 294)
--line-regexp: See 2.1.2. (line 156)
--max-count: See 2.1.3. (line 199)
--no-filename: See 2.1.4. (line 281)
--no-messages: See 2.1.3. (line 245)
--null: See 2.1.4. (line 319)
---null-data: See 2.1.7. (line 491)
+--null-data: See 2.1.7. (line 499)
--only-matching: See 2.1.3. (line 232)
---perl-regexp: See 2.4. (line 725)
+--perl-regexp: See 2.4. (line 739)
--quiet: See 2.1.3. (line 238)
---recursive: See 2.1.6. (line 458)
+--recursive: See 2.1.6. (line 465)
--regexp=PATTERN: See 2.1.2. (line 110)
--silent: See 2.1.3. (line 238)
--text: See 2.1.6. (line 386)
@@ -1774,13 +1788,13 @@
-b: See 2.1.4. (line 268)
-C: See 2.1.5. (line 348)
-c: See 2.1.3. (line 165)
--d: See 2.1.6. (line 422)
--D: See 2.1.6. (line 410)
--E: See 2.4. (line 714)
+-d: See 2.1.6. (line 429)
+-D: See 2.1.6. (line 417)
+-E: See 2.4. (line 728)
-e: See 2.1.2. (line 110)
--F: See 2.4. (line 719)
+-F: See 2.4. (line 733)
-f: See 2.1.2. (line 116)
--G: See 2.4. (line 709)
+-G: See 2.4. (line 723)
-h: See 2.1.4. (line 281)
-H: See 2.1.4. (line 276)
-i: See 2.1.2. (line 123)
@@ -1790,174 +1804,174 @@
-n: See 2.1.4. (line 294)
-NUM: See 2.1.5. (line 348)
-o: See 2.1.3. (line 232)
--P: See 2.4. (line 725)
+-P: See 2.4. (line 739)
-q: See 2.1.3. (line 238)
--R: See 2.1.6. (line 465)
--r: See 2.1.6. (line 458)
+-R: See 2.1.6. (line 473)
+-r: See 2.1.6. (line 465)
-s: See 2.1.3. (line 245)
-T: See 2.1.4. (line 299)
--U: See 2.1.7. (line 478)
+-U: See 2.1.7. (line 486)
-u: See 2.1.4. (line 309)
-v: See 2.1.2. (line 142)
-V: See 2.1.1. (line 101)
-w: See 2.1.2. (line 147)
-x: See 2.1.2. (line 156)
-y: See 2.1.2. (line 123)
--z: See 2.1.7. (line 491)
+-z: See 2.1.7. (line 499)
-Z: See 2.1.4. (line 319)
-.: See 3.1. (line 764)
-?: See 3.1. (line 767)
-_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 677)
+.: See 3.1. (line 778)
+?: See 3.1. (line 781)
+_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 691)
after context: See 2.1.5. (line 339)
-alnum character class: See 3.2. (line 830)
-alpha character class: See 3.2. (line 835)
-alphabetic characters: See 3.2. (line 835)
-alphanumeric characters: See 3.2. (line 830)
-anchoring: See 3.4. (line 962)
-asterisk: See 3.1. (line 770)
-back-reference: See 3.5. (line 970)
-backslash: See 3.3. (line 928)
-basic regular expressions: See 3.6. (line 982)
+alnum character class: See 3.2. (line 844)
+alpha character class: See 3.2. (line 849)
+alphabetic characters: See 3.2. (line 849)
+alphanumeric characters: See 3.2. (line 844)
+anchoring: See 3.4. (line 976)
+asterisk: See 3.1. (line 784)
+back-reference: See 3.5. (line 984)
+backslash: See 3.3. (line 942)
+basic regular expressions: See 3.6. (line 996)
before context: See 2.1.5. (line 343)
binary files: See 2.1.6. (line 386)
-binary files, MS-DOS/MS-Windows: See 2.1.7. (line 478)
-blank character class: See 3.2. (line 840)
-blank characters: See 3.2. (line 840)
-bn GREP_COLORS capability: See 2.2. (line 621)
-braces, first argument omitted: See 3.1. (line 782)
-braces, one argument: See 3.1. (line 776)
-braces, second argument omitted: See 3.1. (line 779)
-braces, two arguments: See 3.1. (line 786)
-bracket expression: See 3.2. (line 807)
-Bugs, known: See 5.1. (line 1205)
-bugs, reporting: See 5. (line 1197)
+binary files, MS-DOS/MS-Windows: See 2.1.7. (line 486)
+blank character class: See 3.2. (line 854)
+blank characters: See 3.2. (line 854)
+bn GREP_COLORS capability: See 2.2. (line 635)
+braces, first argument omitted: See 3.1. (line 796)
+braces, one argument: See 3.1. (line 790)
+braces, second argument omitted: See 3.1. (line 793)
+braces, two arguments: See 3.1. (line 800)
+bracket expression: See 3.2. (line 821)
+Bugs, known: See 5.1. (line 1219)
+bugs, reporting: See 5. (line 1211)
byte offset: See 2.1.4. (line 268)
byte offsets, on MS-DOS/MS-Windows: See 2.1.4. (line 309)
case insensitive search: See 2.1.2. (line 123)
changing name of standard input: See 2.1.4. (line 286)
-character class: See 3.2. (line 807)
-character classes: See 3.2. (line 829)
-character type: See 2.2. (line 648)
-classes of characters: See 3.2. (line 829)
-cntrl character class: See 3.2. (line 843)
+character class: See 3.2. (line 821)
+character classes: See 3.2. (line 843)
+character type: See 2.2. (line 662)
+classes of characters: See 3.2. (line 843)
+cntrl character class: See 3.2. (line 857)
context: See 2.1.5. (line 348)
context lines, after match: See 2.1.5. (line 339)
context lines, before match: See 2.1.5. (line 343)
-control characters: See 3.2. (line 843)
-copying: See 6. (line 1215)
+control characters: See 3.2. (line 857)
+copying: See 6. (line 1229)
counting lines: See 2.1.3. (line 165)
-cx GREP_COLORS capability: See 2.2. (line 572)
-default options environment variable: See 2.2. (line 538)
-device search: See 2.1.6. (line 410)
-digit character class: See 3.2. (line 848)
-digit characters: See 3.2. (line 848)
-directory search: See 2.1.6. (line 422)
-dot: See 3.1. (line 764)
-environment variables: See 2.2. (line 537)
-exclude directories: See 2.1.6. (line 444)
-exclude files: See 2.1.6. (line 433)
-exit status: See 2.3. (line 690)
-FAQ about grep usage: See 4. (line 1012)
+cx GREP_COLORS capability: See 2.2. (line 586)
+default options environment variable: See 2.2. (line 546)
+device search: See 2.1.6. (line 417)
+digit character class: See 3.2. (line 862)
+digit characters: See 3.2. (line 862)
+directory search: See 2.1.6. (line 429)
+dot: See 3.1. (line 778)
+environment variables: See 2.2. (line 545)
+exclude directories: See 2.1.6. (line 451)
+exclude files: See 2.1.6. (line 440)
+exit status: See 2.3. (line 704)
+FAQ about grep usage: See 4. (line 1026)
files which don't match: See 2.1.3. (line 186)
-fn GREP_COLORS capability: See 2.2. (line 611)
-graph character class: See 3.2. (line 851)
-graphic characters: See 3.2. (line 851)
-grep programs: See 2.4. (line 699)
-GREP_COLOR environment variable: See 2.2. (line 545)
-GREP_COLORS environment variable: See 2.2. (line 556)
-GREP_OPTIONS environment variable: See 2.2. (line 538)
+fn GREP_COLORS capability: See 2.2. (line 625)
+graph character class: See 3.2. (line 865)
+graphic characters: See 3.2. (line 865)
+grep programs: See 2.4. (line 713)
+GREP_COLOR environment variable: See 2.2. (line 559)
+GREP_COLORS environment variable: See 2.2. (line 570)
+GREP_OPTIONS environment variable: See 2.2. (line 546)
group separator: See 2.1.5. (line 351)
-hexadecimal digits: See 3.2. (line 877)
-highlight markers: See 2.2. (line 545)
+hexadecimal digits: See 3.2. (line 891)
+highlight markers: See 2.2. (line 559)
highlight, color, colour: See 2.1.3. (line 171)
-include files: See 2.1.6. (line 453)
-interval specifications: See 3.6. (line 986)
+include files: See 2.1.6. (line 460)
+interval specifications: See 3.6. (line 1000)
invert matching: See 2.1.2. (line 142)
-LANG environment variable: See 2.2. (line 503)
-LANGUAGE environment variable: See 2.2. (line 503)
-language of messages: See 2.2. (line 663)
-LC_ALL environment variable: See 2.2. (line 503)
-LC_COLLATE environment variable: See 2.2. (line 648)
-LC_CTYPE environment variable: See 2.2. (line 655)
-LC_MESSAGES environment variable: See 2.2. (line 503)
-line buffering: See 2.1.7. (line 473)
+LANG environment variable: See 2.2. (line 511)
+LANGUAGE environment variable: See 2.2. (line 511)
+language of messages: See 2.2. (line 677)
+LC_ALL environment variable: See 2.2. (line 511)
+LC_COLLATE environment variable: See 2.2. (line 662)
+LC_CTYPE environment variable: See 2.2. (line 669)
+LC_MESSAGES environment variable: See 2.2. (line 511)
+line buffering: See 2.1.7. (line 481)
line numbering: See 2.1.4. (line 294)
-ln GREP_COLORS capability: See 2.2. (line 616)
-lower character class: See 3.2. (line 854)
-lower-case letters: See 3.2. (line 854)
-match expression at most M times: See 3.1. (line 782)
-match expression at most once: See 3.1. (line 767)
-match expression from N to M times: See 3.1. (line 786)
-match expression N or more times: See 3.1. (line 779)
-match expression N times: See 3.1. (line 776)
-match expression one or more times: See 3.1. (line 773)
-match expression zero or more times: See 3.1. (line 770)
+ln GREP_COLORS capability: See 2.2. (line 630)
+lower character class: See 3.2. (line 868)
+lower-case letters: See 3.2. (line 868)
+match expression at most M times: See 3.1. (line 796)
+match expression at most once: See 3.1. (line 781)
+match expression from N to M times: See 3.1. (line 800)
+match expression N or more times: See 3.1. (line 793)
+match expression N times: See 3.1. (line 790)
+match expression one or more times: See 3.1. (line 787)
+match expression zero or more times: See 3.1. (line 784)
match the whole line: See 2.1.2. (line 156)
-matching basic regular expressions: See 2.4. (line 709)
-matching extended regular expressions: See 2.4. (line 714)
-matching fixed strings: See 2.4. (line 719)
-matching Perl regular expressions: See 2.4. (line 725)
+matching basic regular expressions: See 2.4. (line 723)
+matching extended regular expressions: See 2.4. (line 728)
+matching fixed strings: See 2.4. (line 733)
+matching Perl regular expressions: See 2.4. (line 739)
matching whole words: See 2.1.2. (line 147)
max-count: See 2.1.3. (line 199)
-mc GREP_COLORS capability: See 2.2. (line 603)
-message language: See 2.2. (line 663)
-ms GREP_COLORS capability: See 2.2. (line 595)
-MS-DOS/MS-Windows binary files: See 2.1.7. (line 478)
+mc GREP_COLORS capability: See 2.2. (line 617)
+message language: See 2.2. (line 677)
+ms GREP_COLORS capability: See 2.2. (line 609)
+MS-DOS/MS-Windows binary files: See 2.1.7. (line 486)
MS-DOS/MS-Windows byte offsets: See 2.1.4. (line 309)
-mt GREP_COLORS capability: See 2.2. (line 587)
+mt GREP_COLORS capability: See 2.2. (line 601)
names of matching files: See 2.1.3. (line 192)
-national language support: See 2.2. (line 648)
-ne GREP_COLORS capability: See 2.2. (line 633)
-NLS: See 2.2. (line 648)
+national language support: See 2.2. (line 662)
+ne GREP_COLORS capability: See 2.2. (line 647)
+NLS: See 2.2. (line 662)
no filename prefix: See 2.1.4. (line 281)
-numeric characters: See 3.2. (line 848)
+numeric characters: See 3.2. (line 862)
only matching: See 2.1.3. (line 232)
-palindromes: See 4. (line 1134)
+palindromes: See 4. (line 1148)
pattern from file: See 2.1.2. (line 116)
pattern list: See 2.1.2. (line 110)
-period: See 3.1. (line 764)
-plus sign: See 3.1. (line 773)
-POSIXLY_CORRECT environment variable: See 2.2. (line 668)
-print character class: See 3.2. (line 859)
+period: See 3.1. (line 778)
+plus sign: See 3.1. (line 787)
+POSIXLY_CORRECT environment variable: See 2.2. (line 682)
+print character class: See 3.2. (line 873)
print non-matching lines: See 2.1.2. (line 142)
-printable characters: See 3.2. (line 859)
-punct character class: See 3.2. (line 862)
-punctuation characters: See 3.2. (line 862)
-question mark: See 3.1. (line 767)
+printable characters: See 3.2. (line 873)
+punct character class: See 3.2. (line 876)
+punctuation characters: See 3.2. (line 876)
+question mark: See 3.1. (line 781)
quiet, silent: See 2.1.3. (line 238)
-range expression: See 3.2. (line 813)
-recursive search: See 2.1.6. (line 458)
-regular expressions: See 3. (line 739)
-return status: See 2.3. (line 690)
-rv GREP_COLORS capability: See 2.2. (line 581)
-searching directory trees: See 2.1.6. (line 433)
+range expression: See 3.2. (line 827)
+recursive search: See 2.1.6. (line 465)
+regular expressions: See 3. (line 753)
+return status: See 2.3. (line 704)
+rv GREP_COLORS capability: See 2.2. (line 595)
+searching directory trees: See 2.1.6. (line 440)
searching for a pattern: See 1. (line 55)
-sl GREP_COLORS capability: See 2.2. (line 564)
-space character class: See 3.2. (line 867)
-space characters: See 3.2. (line 867)
-subexpression: See 3.5. (line 970)
+sl GREP_COLORS capability: See 2.2. (line 578)
+space character class: See 3.2. (line 881)
+space characters: See 3.2. (line 881)
+subexpression: See 3.5. (line 984)
suppress binary data: See 2.1.6. (line 386)
suppress error messages: See 2.1.3. (line 245)
-symbolic links: See 2.1.6. (line 422)
+symbolic links: See 2.1.6. (line 429)
tab-aligned content lines: See 2.1.4. (line 299)
-translation of message language: See 2.2. (line 663)
-upper character class: See 3.2. (line 872)
-upper-case letters: See 3.2. (line 872)
+translation of message language: See 2.2. (line 677)
+upper character class: See 3.2. (line 886)
+upper-case letters: See 3.2. (line 886)
usage summary, printing: See 2.1.1. (line 96)
-usage, examples: See 4. (line 1001)
-using grep, Q&A: See 4. (line 1012)
-variants of grep: See 2.4. (line 699)
+usage, examples: See 4. (line 1015)
+using grep, Q&A: See 4. (line 1026)
+variants of grep: See 2.4. (line 713)
version, printing: See 2.1.1. (line 101)
-whitespace characters: See 3.2. (line 867)
+whitespace characters: See 3.2. (line 881)
with filename prefix: See 2.1.4. (line 276)
-xdigit character class: See 3.2. (line 877)
-xdigit class: See 3.2. (line 877)
+xdigit character class: See 3.2. (line 891)
+xdigit class: See 3.2. (line 891)
zero-terminated file names: See 2.1.4. (line 319)
-zero-terminated lines: See 2.1.7. (line 491)
-{,M}: See 3.1. (line 782)
-{N,M}: See 3.1. (line 786)
-{N,}: See 3.1. (line 779)
-{N}: See 3.1. (line 776)
+zero-terminated lines: See 2.1.7. (line 499)
+{,M}: See 3.1. (line 796)
+{N,M}: See 3.1. (line 800)
+{N,}: See 3.1. (line 793)
+{N}: See 3.1. (line 790)
Local Variables:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to grep/manual/grep.txt,v,
Jim Meyering <=