[Top][All Lists]
[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: |
Tue, 24 Apr 2012 08:04:06 +0000 |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 12/04/24 08:04:00
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- grep.txt 2 Mar 2012 09:28:23 -0000 1.10
+++ grep.txt 24 Apr 2012 08:03:50 -0000 1.11
@@ -35,7 +35,7 @@
`grep' prints lines that contain a match for a pattern.
- This manual is for version 2.11 of GNU Grep.
+ This manual is for version 2.12 of GNU Grep.
This manual is for `grep', a pattern matching engine.
@@ -394,9 +394,14 @@
`-D ACTION'
`--devices=ACTION'
If an input file is a device, FIFO, or socket, use ACTION to
- process it. By default, ACTION is `read', which means that
- devices are read just as if they were ordinary files. If ACTION
- is `skip', devices, FIFOs, and sockets are silently skipped.
+ process it. If ACTION is `read', all devices are read just as if
+ they were ordinary files. If ACTION is `skip', devices, FIFOs,
+ and sockets are silently skipped. By default, devices are read if
+ they are on the command line or if the `-R'
+ (`--dereference-recursive') option is used, and are skipped if
+ they are encountered recursively and the `-r' (`--recursive')
+ option is used. This option has no effect on a file that is read
+ via standard input.
`-d ACTION'
`--directories=ACTION'
@@ -406,8 +411,9 @@
file systems disallow this, and will cause `grep' to print error
messages for every directory or silently skip them). If ACTION is
`skip', directories are silently skipped. If ACTION is `recurse',
- `grep' reads all files under each directory, recursively; this is
- equivalent to the `-r' option.
+ `grep' reads all files under each directory, recursively,
+ following command-line symbolic links and skipping other symlinks;
+ this is equivalent to the `-r' option.
`--exclude=GLOB'
Skip files whose base name matches GLOB (using wildcard matching).
@@ -431,11 +437,16 @@
matching as described under `--exclude').
`-r'
-`-R'
`--recursive'
For each directory operand, read and process all files in that
- directory, recursively. This is the same as the
- `--directories=recurse' option.
+ 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.
+
+`-R'
+`--dereference-recursive'
+ For each directory operand, read and process all files in that
+ directory, recursively, following all symbolic links.
2.1.7 Other Options
@@ -1711,48 +1722,49 @@
Index
*****
-*: See 3.1. (line 759)
-+: See 3.1. (line 762)
+*: See 3.1. (line 770)
++: See 3.1. (line 773)
--after-context: See 2.1.5. (line 326)
---basic-regexp: See 2.4. (line 698)
+--basic-regexp: See 2.4. (line 709)
--before-context: See 2.1.5. (line 330)
---binary: See 2.1.7. (line 457)
+--binary: See 2.1.7. (line 468)
--binary-files: See 2.1.6. (line 378)
--byte-offset: See 2.1.4. (line 255)
--color: See 2.1.3. (line 158)
--colour: See 2.1.3. (line 158)
--context: See 2.1.5. (line 335)
--count: See 2.1.3. (line 152)
+--dereference-recursive: See 2.1.6. (line 448)
--devices: See 2.1.6. (line 396)
---directories: See 2.1.6. (line 403)
---exclude: See 2.1.6. (line 413)
---exclude-dir: See 2.1.6. (line 422)
---exclude-from: See 2.1.6. (line 418)
---extended-regexp: See 2.4. (line 703)
+--directories: See 2.1.6. (line 408)
+--exclude: See 2.1.6. (line 419)
+--exclude-dir: See 2.1.6. (line 428)
+--exclude-from: See 2.1.6. (line 424)
+--extended-regexp: See 2.4. (line 714)
--file: See 2.1.2. (line 116)
--files-with-matches: See 2.1.3. (line 179)
--files-without-match: See 2.1.3. (line 173)
---fixed-strings: See 2.4. (line 708)
+--fixed-strings: See 2.4. (line 719)
--group-separator: See 2.1.5. (line 338)
--help: See 2.1.1. (line 96)
--ignore-case: See 2.1.2. (line 123)
---include: See 2.1.6. (line 430)
+--include: See 2.1.6. (line 436)
--initial-tab: See 2.1.4. (line 286)
--invert-match: See 2.1.2. (line 129)
--label: See 2.1.4. (line 273)
---line-buffered: See 2.1.7. (line 445)
+--line-buffered: See 2.1.7. (line 456)
--line-number: See 2.1.4. (line 281)
--line-regexp: See 2.1.2. (line 143)
--max-count: See 2.1.3. (line 186)
---mmap: See 2.1.7. (line 449)
+--mmap: See 2.1.7. (line 460)
--no-filename: See 2.1.4. (line 268)
--no-messages: See 2.1.3. (line 232)
--null: See 2.1.4. (line 306)
---null-data: See 2.1.7. (line 471)
+--null-data: See 2.1.7. (line 482)
--only-matching: See 2.1.3. (line 219)
---perl-regexp: See 2.4. (line 714)
+--perl-regexp: See 2.4. (line 725)
--quiet: See 2.1.3. (line 225)
---recursive: See 2.1.6. (line 436)
+--recursive: See 2.1.6. (line 441)
--regexp=PATTERN: See 2.1.2. (line 110)
--silent: See 2.1.3. (line 225)
--text: See 2.1.6. (line 374)
@@ -1766,13 +1778,13 @@
-b: See 2.1.4. (line 255)
-C: See 2.1.5. (line 335)
-c: See 2.1.3. (line 152)
--d: See 2.1.6. (line 403)
+-d: See 2.1.6. (line 408)
-D: See 2.1.6. (line 396)
--E: See 2.4. (line 703)
+-E: See 2.4. (line 714)
-e: See 2.1.2. (line 110)
--F: See 2.4. (line 708)
+-F: See 2.4. (line 719)
-f: See 2.1.2. (line 116)
--G: See 2.4. (line 698)
+-G: See 2.4. (line 709)
-h: See 2.1.4. (line 268)
-H: See 2.1.4. (line 263)
-i: See 2.1.2. (line 123)
@@ -1782,169 +1794,171 @@
-n: See 2.1.4. (line 281)
-NUM: See 2.1.5. (line 335)
-o: See 2.1.3. (line 219)
--P: See 2.4. (line 714)
+-P: See 2.4. (line 725)
-q: See 2.1.3. (line 225)
--r: See 2.1.6. (line 436)
+-R: See 2.1.6. (line 448)
+-r: See 2.1.6. (line 441)
-s: See 2.1.3. (line 232)
-T: See 2.1.4. (line 286)
--U: See 2.1.7. (line 457)
+-U: See 2.1.7. (line 468)
-u: See 2.1.4. (line 296)
-v: See 2.1.2. (line 129)
-V: See 2.1.1. (line 101)
-w: See 2.1.2. (line 134)
-x: See 2.1.2. (line 143)
-y: See 2.1.2. (line 123)
--z: See 2.1.7. (line 471)
+-z: See 2.1.7. (line 482)
-Z: See 2.1.4. (line 306)
-.: See 3.1. (line 753)
-?: See 3.1. (line 756)
-_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 663)
+.: See 3.1. (line 764)
+?: See 3.1. (line 767)
+_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 674)
after context: See 2.1.5. (line 326)
-alnum character class: See 3.2. (line 817)
-alpha character class: See 3.2. (line 822)
-alphabetic characters: See 3.2. (line 822)
-alphanumeric characters: See 3.2. (line 817)
-anchoring: See 3.4. (line 949)
-asterisk: See 3.1. (line 759)
-back-reference: See 3.5. (line 957)
-backslash: See 3.3. (line 915)
-basic regular expressions: See 3.6. (line 969)
+alnum character class: See 3.2. (line 828)
+alpha character class: See 3.2. (line 833)
+alphabetic characters: See 3.2. (line 833)
+alphanumeric characters: See 3.2. (line 828)
+anchoring: See 3.4. (line 960)
+asterisk: See 3.1. (line 770)
+back-reference: See 3.5. (line 968)
+backslash: See 3.3. (line 926)
+basic regular expressions: See 3.6. (line 980)
before context: See 2.1.5. (line 330)
binary files: See 2.1.6. (line 374)
-binary files, MS-DOS/MS-Windows: See 2.1.7. (line 457)
-blank character class: See 3.2. (line 827)
-blank characters: See 3.2. (line 827)
-bn GREP_COLORS capability: See 2.2. (line 608)
-braces, first argument omitted: See 3.1. (line 771)
-braces, one argument: See 3.1. (line 765)
-braces, second argument omitted: See 3.1. (line 768)
-braces, two arguments: See 3.1. (line 774)
-bracket expression: See 3.2. (line 794)
-Bugs, known: See 5.1. (line 1196)
-bugs, reporting: See 5. (line 1188)
+binary files, MS-DOS/MS-Windows: See 2.1.7. (line 468)
+blank character class: See 3.2. (line 838)
+blank characters: See 3.2. (line 838)
+bn GREP_COLORS capability: See 2.2. (line 619)
+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 785)
+bracket expression: See 3.2. (line 805)
+Bugs, known: See 5.1. (line 1207)
+bugs, reporting: See 5. (line 1199)
byte offset: See 2.1.4. (line 255)
byte offsets, on MS-DOS/MS-Windows: See 2.1.4. (line 296)
case insensitive search: See 2.1.2. (line 123)
changing name of standard input: See 2.1.4. (line 273)
-character class: See 3.2. (line 794)
-character classes: See 3.2. (line 816)
-character type: See 2.2. (line 635)
-classes of characters: See 3.2. (line 816)
-cntrl character class: See 3.2. (line 830)
+character class: See 3.2. (line 805)
+character classes: See 3.2. (line 827)
+character type: See 2.2. (line 646)
+classes of characters: See 3.2. (line 827)
+cntrl character class: See 3.2. (line 841)
context: See 2.1.5. (line 335)
context lines, after match: See 2.1.5. (line 326)
context lines, before match: See 2.1.5. (line 330)
-control characters: See 3.2. (line 830)
-copying: See 6. (line 1206)
+control characters: See 3.2. (line 841)
+copying: See 6. (line 1217)
counting lines: See 2.1.3. (line 152)
-cx GREP_COLORS capability: See 2.2. (line 559)
-default options environment variable: See 2.2. (line 515)
+cx GREP_COLORS capability: See 2.2. (line 570)
+default options environment variable: See 2.2. (line 526)
device search: See 2.1.6. (line 396)
-digit character class: See 3.2. (line 835)
-digit characters: See 3.2. (line 835)
-directory search: See 2.1.6. (line 403)
-dot: See 3.1. (line 753)
-environment variables: See 2.2. (line 514)
-exclude directories: See 2.1.6. (line 422)
-exclude files: See 2.1.6. (line 413)
-exit status: See 2.3. (line 676)
-FAQ about grep usage: See 4. (line 999)
+digit character class: See 3.2. (line 846)
+digit characters: See 3.2. (line 846)
+directory search: See 2.1.6. (line 408)
+dot: See 3.1. (line 764)
+environment variables: See 2.2. (line 525)
+exclude directories: See 2.1.6. (line 428)
+exclude files: See 2.1.6. (line 419)
+exit status: See 2.3. (line 687)
+FAQ about grep usage: See 4. (line 1010)
files which don't match: See 2.1.3. (line 173)
-fn GREP_COLORS capability: See 2.2. (line 598)
-graph character class: See 3.2. (line 838)
-graphic characters: See 3.2. (line 838)
-grep programs: See 2.4. (line 688)
-GREP_COLOR environment variable: See 2.2. (line 532)
-GREP_COLORS environment variable: See 2.2. (line 543)
-GREP_OPTIONS environment variable: See 2.2. (line 515)
+fn GREP_COLORS capability: See 2.2. (line 609)
+graph character class: See 3.2. (line 849)
+graphic characters: See 3.2. (line 849)
+grep programs: See 2.4. (line 699)
+GREP_COLOR environment variable: See 2.2. (line 543)
+GREP_COLORS environment variable: See 2.2. (line 554)
+GREP_OPTIONS environment variable: See 2.2. (line 526)
group separator: See 2.1.5. (line 338)
-hexadecimal digits: See 3.2. (line 864)
-highlight markers: See 2.2. (line 532)
+hexadecimal digits: See 3.2. (line 875)
+highlight markers: See 2.2. (line 543)
highlight, color, colour: See 2.1.3. (line 158)
-include files: See 2.1.6. (line 430)
-interval specifications: See 3.6. (line 973)
+include files: See 2.1.6. (line 436)
+interval specifications: See 3.6. (line 984)
invert matching: See 2.1.2. (line 129)
-LANG environment variable: See 2.2. (line 635)
-language of messages: See 2.2. (line 649)
-LC_ALL environment variable: See 2.2. (line 635)
-LC_COLLATE environment variable: See 2.2. (line 635)
-LC_CTYPE environment variable: See 2.2. (line 642)
-LC_MESSAGES environment variable: See 2.2. (line 649)
-line buffering: See 2.1.7. (line 445)
+LANG environment variable: See 2.2. (line 646)
+language of messages: See 2.2. (line 660)
+LC_ALL environment variable: See 2.2. (line 646)
+LC_COLLATE environment variable: See 2.2. (line 646)
+LC_CTYPE environment variable: See 2.2. (line 653)
+LC_MESSAGES environment variable: See 2.2. (line 660)
+line buffering: See 2.1.7. (line 456)
line numbering: See 2.1.4. (line 281)
-ln GREP_COLORS capability: See 2.2. (line 603)
-lower character class: See 3.2. (line 841)
-lower-case letters: See 3.2. (line 841)
-match expression at most M times: See 3.1. (line 771)
-match expression at most once: See 3.1. (line 756)
-match expression from N to M times: See 3.1. (line 774)
-match expression N or more times: See 3.1. (line 768)
-match expression N times: See 3.1. (line 765)
-match expression one or more times: See 3.1. (line 762)
-match expression zero or more times: See 3.1. (line 759)
+ln GREP_COLORS capability: See 2.2. (line 614)
+lower character class: See 3.2. (line 852)
+lower-case letters: See 3.2. (line 852)
+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 785)
+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)
match the whole line: See 2.1.2. (line 143)
-matching basic regular expressions: See 2.4. (line 698)
-matching extended regular expressions: See 2.4. (line 703)
-matching fixed strings: See 2.4. (line 708)
-matching Perl regular expressions: See 2.4. (line 714)
+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 whole words: See 2.1.2. (line 134)
max-count: See 2.1.3. (line 186)
-mc GREP_COLORS capability: See 2.2. (line 590)
-memory mapped input: See 2.1.7. (line 449)
-message language: See 2.2. (line 649)
-ms GREP_COLORS capability: See 2.2. (line 582)
-MS-DOS/MS-Windows binary files: See 2.1.7. (line 457)
+mc GREP_COLORS capability: See 2.2. (line 601)
+memory mapped input: See 2.1.7. (line 460)
+message language: See 2.2. (line 660)
+ms GREP_COLORS capability: See 2.2. (line 593)
+MS-DOS/MS-Windows binary files: See 2.1.7. (line 468)
MS-DOS/MS-Windows byte offsets: See 2.1.4. (line 296)
-mt GREP_COLORS capability: See 2.2. (line 574)
+mt GREP_COLORS capability: See 2.2. (line 585)
names of matching files: See 2.1.3. (line 179)
-national language support: See 2.2. (line 635)
-ne GREP_COLORS capability: See 2.2. (line 620)
-NLS: See 2.2. (line 635)
+national language support: See 2.2. (line 646)
+ne GREP_COLORS capability: See 2.2. (line 631)
+NLS: See 2.2. (line 646)
no filename prefix: See 2.1.4. (line 268)
-numeric characters: See 3.2. (line 835)
+numeric characters: See 3.2. (line 846)
only matching: See 2.1.3. (line 219)
-palindromes: See 4. (line 1121)
+palindromes: See 4. (line 1132)
pattern from file: See 2.1.2. (line 116)
pattern list: See 2.1.2. (line 110)
-period: See 3.1. (line 753)
-plus sign: See 3.1. (line 762)
-POSIXLY_CORRECT environment variable: See 2.2. (line 654)
-print character class: See 3.2. (line 846)
+period: See 3.1. (line 764)
+plus sign: See 3.1. (line 773)
+POSIXLY_CORRECT environment variable: See 2.2. (line 665)
+print character class: See 3.2. (line 857)
print non-matching lines: See 2.1.2. (line 129)
-printable characters: See 3.2. (line 846)
-punct character class: See 3.2. (line 849)
-punctuation characters: See 3.2. (line 849)
-question mark: See 3.1. (line 756)
+printable characters: See 3.2. (line 857)
+punct character class: See 3.2. (line 860)
+punctuation characters: See 3.2. (line 860)
+question mark: See 3.1. (line 767)
quiet, silent: See 2.1.3. (line 225)
-range expression: See 3.2. (line 800)
-recursive search: See 2.1.6. (line 436)
-regular expressions: See 3. (line 728)
-return status: See 2.3. (line 676)
-rv GREP_COLORS capability: See 2.2. (line 568)
-searching directory trees: See 2.1.6. (line 413)
+range expression: See 3.2. (line 811)
+recursive search: See 2.1.6. (line 441)
+regular expressions: See 3. (line 739)
+return status: See 2.3. (line 687)
+rv GREP_COLORS capability: See 2.2. (line 579)
+searching directory trees: See 2.1.6. (line 419)
searching for a pattern: See 1. (line 55)
-sl GREP_COLORS capability: See 2.2. (line 551)
-space character class: See 3.2. (line 854)
-space characters: See 3.2. (line 854)
-subexpression: See 3.5. (line 957)
+sl GREP_COLORS capability: See 2.2. (line 562)
+space character class: See 3.2. (line 865)
+space characters: See 3.2. (line 865)
+subexpression: See 3.5. (line 968)
suppress binary data: See 2.1.6. (line 374)
suppress error messages: See 2.1.3. (line 232)
+symbolic links: See 2.1.6. (line 408)
tab-aligned content lines: See 2.1.4. (line 286)
-translation of message language: See 2.2. (line 649)
-upper character class: See 3.2. (line 859)
-upper-case letters: See 3.2. (line 859)
+translation of message language: See 2.2. (line 660)
+upper character class: See 3.2. (line 870)
+upper-case letters: See 3.2. (line 870)
usage summary, printing: See 2.1.1. (line 96)
-usage, examples: See 4. (line 988)
-using grep, Q&A: See 4. (line 999)
-variants of grep: See 2.4. (line 688)
+usage, examples: See 4. (line 999)
+using grep, Q&A: See 4. (line 1010)
+variants of grep: See 2.4. (line 699)
version, printing: See 2.1.1. (line 101)
-whitespace characters: See 3.2. (line 854)
+whitespace characters: See 3.2. (line 865)
with filename prefix: See 2.1.4. (line 263)
-xdigit character class: See 3.2. (line 864)
-xdigit class: See 3.2. (line 864)
+xdigit character class: See 3.2. (line 875)
+xdigit class: See 3.2. (line 875)
zero-terminated file names: See 2.1.4. (line 306)
-zero-terminated lines: See 2.1.7. (line 471)
-{,M}: See 3.1. (line 771)
-{N,M}: See 3.1. (line 774)
-{N,}: See 3.1. (line 768)
-{N}: See 3.1. (line 765)
+zero-terminated lines: See 2.1.7. (line 482)
+{,M}: See 3.1. (line 782)
+{N,M}: See 3.1. (line 785)
+{N,}: See 3.1. (line 779)
+{N}: See 3.1. (line 776)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to grep/manual/grep.txt,v,
Jim Meyering <=