[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: |
Wed, 04 Jul 2012 16:36:28 +0000 |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 12/07/04 16:36:26
Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- grep.txt 24 Apr 2012 08:03:50 -0000 1.11
+++ grep.txt 4 Jul 2012 16:36:21 -0000 1.12
@@ -35,7 +35,7 @@
`grep' prints lines that contain a match for a pattern.
- This manual is for version 2.12 of GNU Grep.
+ This manual is for version 2.13 of GNU Grep.
This manual is for `grep', a pattern matching engine.
@@ -375,11 +375,11 @@
the `--binary-files=text' option.
`--binary-files=TYPE'
- If the first few bytes of a file 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.
+ If a file's allocation metadata or its first few bytes 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.
If TYPE is `without-match', `grep' assumes that a binary file does
not match; this is equivalent to the `-I' option.
@@ -466,9 +466,9 @@
`-U'
`--binary'
Treat the file(s) as binary. By default, under MS-DOS and
- MS-Windows, `grep' guesses the file type by looking at the
- contents of the first 32kB read from the file. If `grep' decides
- the file is a text file, it strips the `CR' characters from the
+ MS-Windows, `grep' guesses whether a file is text or binary as
+ described for the `--binary-files' option. If `grep' decides the
+ file is a text file, it strips the `CR' characters from the
original file contents (to make regular expressions with `^' and
`$' work correctly). Specifying `-U' overrules this guesswork,
causing all files to be read and passed to the matching mechanism
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to grep/manual/grep.txt,v,
Jim Meyering <=