[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, 18 Feb 2014 03:42:15 +0000 |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 14/02/18 03:42:13
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- grep.txt 2 Jan 2014 06:37:13 -0000 1.15
+++ grep.txt 18 Feb 2014 03:42:11 -0000 1.16
@@ -35,7 +35,7 @@
`grep' prints lines that contain a match for a pattern.
- This manual is for version 2.16 of GNU Grep.
+ This manual is for version 2.17 of GNU Grep.
This manual is for `grep', a pattern matching engine.
@@ -456,13 +456,6 @@
Use line buffering on output. This can cause a performance
penalty.
-`--mmap'
- This option is deprecated and now elicits a warning, but is
- otherwise a no-op. It used to make `grep' read input with the
- `mmap' system call, instead of the default `read' system call. On
- modern systems, `mmap' would rarely if ever yield better
- performance.
-
`-U'
`--binary'
Treat the file(s) as binary. By default, under MS-DOS and
@@ -644,8 +637,8 @@
`LC_COLLATE'
`LANG'
These variables specify the locale for the `LC_COLLATE' category,
- which determines the collating sequence used to interpret range
- expressions like `[a-z]'.
+ which might affect how range expressions like `[a-z]' are
+ interpreted.
`LC_ALL'
`LC_CTYPE'
@@ -811,14 +804,14 @@
Within a bracket expression, a "range expression" consists of two
characters separated by a hyphen. It matches any single character that
-sorts between the two characters, inclusive, using the locale's
-collating sequence and character set. For example, in the default C
-locale, `[a-d]' is equivalent to `[abcd]'. Many locales sort
-characters in dictionary order, and in these locales `[a-d]' is
-typically not equivalent to `[abcd]'; it might be equivalent to
-`[aBbCcDd]', for example. To obtain the traditional interpretation of
-bracket expressions, you can use the `C' locale by setting the `LC_ALL'
-environment variable to the value `C'.
+sorts between the two characters, inclusive. In the default C locale,
+the sorting sequence is the native character order; for example,
+`[a-d]' is equivalent to `[abcd]'. In other locales, the sorting
+sequence is not specified, and `[a-d]' might be equivalent to `[abcd]'
+or to `[aBbCcDd]', or it might fail to match any character, or the set
+of characters that it matches might even be erratic. To obtain the
+traditional interpretation of bracket expressions, you can use the `C'
+locale by setting the `LC_ALL' environment variable to the value `C'.
Finally, certain named classes of characters are predefined within
bracket expressions, as follows. Their interpretation depends on the
@@ -1723,12 +1716,12 @@
Index
*****
-*: See 3.1. (line 770)
-+: See 3.1. (line 773)
+*: See 3.1. (line 763)
++: See 3.1. (line 766)
--after-context: See 2.1.5. (line 326)
---basic-regexp: See 2.4. (line 709)
+--basic-regexp: See 2.4. (line 702)
--before-context: See 2.1.5. (line 330)
---binary: See 2.1.7. (line 468)
+--binary: See 2.1.7. (line 461)
--binary-files: See 2.1.6. (line 378)
--byte-offset: See 2.1.4. (line 255)
--color: See 2.1.3. (line 158)
@@ -1741,11 +1734,11 @@
--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)
+--extended-regexp: See 2.4. (line 707)
--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 719)
+--fixed-strings: See 2.4. (line 712)
--group-separator: See 2.1.5. (line 338)
--help: See 2.1.1. (line 96)
--ignore-case: See 2.1.2. (line 123)
@@ -1757,13 +1750,12 @@
--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 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 482)
+--null-data: See 2.1.7. (line 475)
--only-matching: See 2.1.3. (line 219)
---perl-regexp: See 2.4. (line 725)
+--perl-regexp: See 2.4. (line 718)
--quiet: See 2.1.3. (line 225)
--recursive: See 2.1.6. (line 441)
--regexp=PATTERN: See 2.1.2. (line 110)
@@ -1781,11 +1773,11 @@
-c: See 2.1.3. (line 152)
-d: See 2.1.6. (line 408)
-D: See 2.1.6. (line 396)
--E: See 2.4. (line 714)
+-E: See 2.4. (line 707)
-e: See 2.1.2. (line 110)
--F: See 2.4. (line 719)
+-F: See 2.4. (line 712)
-f: See 2.1.2. (line 116)
--G: See 2.4. (line 709)
+-G: See 2.4. (line 702)
-h: See 2.1.4. (line 268)
-H: See 2.1.4. (line 263)
-i: See 2.1.2. (line 123)
@@ -1795,171 +1787,170 @@
-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 725)
+-P: See 2.4. (line 718)
-q: See 2.1.3. (line 225)
-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 468)
+-U: See 2.1.7. (line 461)
-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 482)
+-z: See 2.1.7. (line 475)
-Z: See 2.1.4. (line 306)
-.: See 3.1. (line 764)
-?: See 3.1. (line 767)
-_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 674)
+.: See 3.1. (line 757)
+?: See 3.1. (line 760)
+_N_GNU_nonoption_argv_flags_ environment variable:See 2.2. (line 667)
after context: See 2.1.5. (line 326)
-alnum character class: See 3.2. (line 829)
-alpha character class: See 3.2. (line 834)
-alphabetic characters: See 3.2. (line 834)
-alphanumeric characters: See 3.2. (line 829)
-anchoring: See 3.4. (line 961)
-asterisk: See 3.1. (line 770)
-back-reference: See 3.5. (line 969)
-backslash: See 3.3. (line 927)
-basic regular expressions: See 3.6. (line 981)
+alnum character class: See 3.2. (line 822)
+alpha character class: See 3.2. (line 827)
+alphabetic characters: See 3.2. (line 827)
+alphanumeric characters: See 3.2. (line 822)
+anchoring: See 3.4. (line 954)
+asterisk: See 3.1. (line 763)
+back-reference: See 3.5. (line 962)
+backslash: See 3.3. (line 920)
+basic regular expressions: See 3.6. (line 974)
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 468)
-blank character class: See 3.2. (line 839)
-blank characters: See 3.2. (line 839)
-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 786)
-bracket expression: See 3.2. (line 806)
-Bugs, known: See 5.1. (line 1208)
-bugs, reporting: See 5. (line 1200)
+binary files, MS-DOS/MS-Windows: See 2.1.7. (line 461)
+blank character class: See 3.2. (line 832)
+blank characters: See 3.2. (line 832)
+bn GREP_COLORS capability: See 2.2. (line 612)
+braces, first argument omitted: See 3.1. (line 775)
+braces, one argument: See 3.1. (line 769)
+braces, second argument omitted: See 3.1. (line 772)
+braces, two arguments: See 3.1. (line 779)
+bracket expression: See 3.2. (line 799)
+Bugs, known: See 5.1. (line 1201)
+bugs, reporting: See 5. (line 1193)
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 806)
-character classes: See 3.2. (line 828)
-character type: See 2.2. (line 646)
-classes of characters: See 3.2. (line 828)
-cntrl character class: See 3.2. (line 842)
+character class: See 3.2. (line 799)
+character classes: See 3.2. (line 821)
+character type: See 2.2. (line 639)
+classes of characters: See 3.2. (line 821)
+cntrl character class: See 3.2. (line 835)
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 842)
-copying: See 6. (line 1218)
+control characters: See 3.2. (line 835)
+copying: See 6. (line 1211)
counting lines: See 2.1.3. (line 152)
-cx GREP_COLORS capability: See 2.2. (line 570)
-default options environment variable: See 2.2. (line 526)
+cx GREP_COLORS capability: See 2.2. (line 563)
+default options environment variable: See 2.2. (line 519)
device search: See 2.1.6. (line 396)
-digit character class: See 3.2. (line 847)
-digit characters: See 3.2. (line 847)
+digit character class: See 3.2. (line 840)
+digit characters: See 3.2. (line 840)
directory search: See 2.1.6. (line 408)
-dot: See 3.1. (line 764)
-environment variables: See 2.2. (line 525)
+dot: See 3.1. (line 757)
+environment variables: See 2.2. (line 518)
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 1011)
+exit status: See 2.3. (line 680)
+FAQ about grep usage: See 4. (line 1004)
files which don't match: See 2.1.3. (line 173)
-fn GREP_COLORS capability: See 2.2. (line 609)
-graph character class: See 3.2. (line 850)
-graphic characters: See 3.2. (line 850)
-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)
+fn GREP_COLORS capability: See 2.2. (line 602)
+graph character class: See 3.2. (line 843)
+graphic characters: See 3.2. (line 843)
+grep programs: See 2.4. (line 692)
+GREP_COLOR environment variable: See 2.2. (line 536)
+GREP_COLORS environment variable: See 2.2. (line 547)
+GREP_OPTIONS environment variable: See 2.2. (line 519)
group separator: See 2.1.5. (line 338)
-hexadecimal digits: See 3.2. (line 876)
-highlight markers: See 2.2. (line 543)
+hexadecimal digits: See 3.2. (line 869)
+highlight markers: See 2.2. (line 536)
highlight, color, colour: See 2.1.3. (line 158)
include files: See 2.1.6. (line 436)
-interval specifications: See 3.6. (line 985)
+interval specifications: See 3.6. (line 978)
invert matching: See 2.1.2. (line 129)
-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)
+LANG environment variable: See 2.2. (line 639)
+language of messages: See 2.2. (line 653)
+LC_ALL environment variable: See 2.2. (line 639)
+LC_COLLATE environment variable: See 2.2. (line 639)
+LC_CTYPE environment variable: See 2.2. (line 646)
+LC_MESSAGES environment variable: See 2.2. (line 653)
line buffering: See 2.1.7. (line 456)
line numbering: See 2.1.4. (line 281)
-ln GREP_COLORS capability: See 2.2. (line 614)
-lower character class: See 3.2. (line 853)
-lower-case letters: See 3.2. (line 853)
-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 607)
+lower character class: See 3.2. (line 846)
+lower-case letters: See 3.2. (line 846)
+match expression at most M times: See 3.1. (line 775)
+match expression at most once: See 3.1. (line 760)
+match expression from N to M times: See 3.1. (line 779)
+match expression N or more times: See 3.1. (line 772)
+match expression N times: See 3.1. (line 769)
+match expression one or more times: See 3.1. (line 766)
+match expression zero or more times: See 3.1. (line 763)
match the whole line: See 2.1.2. (line 143)
-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 702)
+matching extended regular expressions: See 2.4. (line 707)
+matching fixed strings: See 2.4. (line 712)
+matching Perl regular expressions: See 2.4. (line 718)
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 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)
+mc GREP_COLORS capability: See 2.2. (line 594)
+message language: See 2.2. (line 653)
+ms GREP_COLORS capability: See 2.2. (line 586)
+MS-DOS/MS-Windows binary files: See 2.1.7. (line 461)
MS-DOS/MS-Windows byte offsets: See 2.1.4. (line 296)
-mt GREP_COLORS capability: See 2.2. (line 585)
+mt GREP_COLORS capability: See 2.2. (line 578)
names of matching files: See 2.1.3. (line 179)
-national language support: See 2.2. (line 646)
-ne GREP_COLORS capability: See 2.2. (line 631)
-NLS: See 2.2. (line 646)
+national language support: See 2.2. (line 639)
+ne GREP_COLORS capability: See 2.2. (line 624)
+NLS: See 2.2. (line 639)
no filename prefix: See 2.1.4. (line 268)
-numeric characters: See 3.2. (line 847)
+numeric characters: See 3.2. (line 840)
only matching: See 2.1.3. (line 219)
-palindromes: See 4. (line 1133)
+palindromes: See 4. (line 1126)
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 665)
-print character class: See 3.2. (line 858)
+period: See 3.1. (line 757)
+plus sign: See 3.1. (line 766)
+POSIXLY_CORRECT environment variable: See 2.2. (line 658)
+print character class: See 3.2. (line 851)
print non-matching lines: See 2.1.2. (line 129)
-printable characters: See 3.2. (line 858)
-punct character class: See 3.2. (line 861)
-punctuation characters: See 3.2. (line 861)
-question mark: See 3.1. (line 767)
+printable characters: See 3.2. (line 851)
+punct character class: See 3.2. (line 854)
+punctuation characters: See 3.2. (line 854)
+question mark: See 3.1. (line 760)
quiet, silent: See 2.1.3. (line 225)
-range expression: See 3.2. (line 812)
+range expression: See 3.2. (line 805)
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)
+regular expressions: See 3. (line 732)
+return status: See 2.3. (line 680)
+rv GREP_COLORS capability: See 2.2. (line 572)
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 562)
-space character class: See 3.2. (line 866)
-space characters: See 3.2. (line 866)
-subexpression: See 3.5. (line 969)
+sl GREP_COLORS capability: See 2.2. (line 555)
+space character class: See 3.2. (line 859)
+space characters: See 3.2. (line 859)
+subexpression: See 3.5. (line 962)
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 660)
-upper character class: See 3.2. (line 871)
-upper-case letters: See 3.2. (line 871)
+translation of message language: See 2.2. (line 653)
+upper character class: See 3.2. (line 864)
+upper-case letters: See 3.2. (line 864)
usage summary, printing: See 2.1.1. (line 96)
-usage, examples: See 4. (line 1000)
-using grep, Q&A: See 4. (line 1011)
-variants of grep: See 2.4. (line 699)
+usage, examples: See 4. (line 993)
+using grep, Q&A: See 4. (line 1004)
+variants of grep: See 2.4. (line 692)
version, printing: See 2.1.1. (line 101)
-whitespace characters: See 3.2. (line 866)
+whitespace characters: See 3.2. (line 859)
with filename prefix: See 2.1.4. (line 263)
-xdigit character class: See 3.2. (line 876)
-xdigit class: See 3.2. (line 876)
+xdigit character class: See 3.2. (line 869)
+xdigit class: See 3.2. (line 869)
zero-terminated file names: See 2.1.4. (line 306)
-zero-terminated lines: See 2.1.7. (line 482)
-{,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 475)
+{,M}: See 3.1. (line 775)
+{N,M}: See 3.1. (line 779)
+{N,}: See 3.1. (line 772)
+{N}: See 3.1. (line 769)
- Changes to grep/manual/grep.txt,v,
Jim Meyering <=