CVSROOT: /webcvs/grep Module name: grep Changes by: Jim Meyering <meyering> 12/07/04 16:36:26
Index: grep.html =================================================================== RCS file: /webcvs/grep/grep/manual/grep.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- grep.html 24 Apr 2012 08:03:49 -0000 1.11 +++ grep.html 4 Jul 2012 16:36:20 -0000 1.12 @@ -1,8 +1,8 @@ <html lang="en"> <head> -<title>GNU Grep 2.12</title> +<title>GNU Grep 2.13</title> <meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="GNU Grep 2.12"> +<meta name="description" content="GNU Grep 2.13"> <meta name="generator" content="makeinfo 4.13"> <link title="Top" rel="top" href="#Top"> <link href="http://www.gnu.org/software/texinfo/"; rel="generator-home" title="Texinfo Homepage"> @@ -33,7 +33,7 @@ --></style> </head> <body> -<h1 class="settitle">GNU Grep 2.12</h1> +<h1 class="settitle">GNU Grep 2.13</h1> <div class="contents"> <h2>Table of Contents</h2> <ul> @@ -91,7 +91,7 @@ <p><samp><span class="command">grep</span></samp> prints lines that contain a match for a pattern. - <p>This manual is for version 2.12 of GNU Grep. + <p>This manual is for version 2.13 of GNU Grep. <p>This manual is for <samp><span class="command">grep</span></samp>, a pattern matching engine. @@ -298,7 +298,7 @@ green byte offsets, cyan separators, and default terminal colors otherwise. The deprecated environment variable <samp><span class="env">GREP_COLOR</span></samp> is still supported, but its setting does not have priority; -it defaults to `01;31' (bold red) +it defaults to ‘<samp><span class="samp">01;31</span></samp>’ (bold red) which only covers the color for matched text. <var>WHEN</var> is ‘<samp><span class="samp">never</span></samp>’, ‘<samp><span class="samp">always</span></samp>’, or ‘<samp><span class="samp">auto</span></samp>’. @@ -520,7 +520,8 @@ <dt><samp><span class="option">-a</span></samp><dt><samp><span class="option">--text</span></samp><dd><a name="index-g_t_002da-92"></a><a name="index-g_t_002d_002dtext-93"></a><a name="index-suppress-binary-data-94"></a><a name="index-binary-files-95"></a>Process a binary file as if it were text; this is equivalent to the ‘<samp><span class="samp">--binary-files=text</span></samp>’ option. - <br><dt><samp><span class="option">--binary-files=</span><var>type</var></samp><dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>If the first few bytes of a file indicate that the file contains binary data, + <br><dt><samp><span class="option">--binary-files=</span><var>type</var></samp><dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>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 <var>type</var>. By default, <var>type</var> is ‘<samp><span class="samp">binary</span></samp>’, and <samp><span class="command">grep</span></samp> normally outputs either @@ -615,8 +616,8 @@ <br><dt><samp><span class="option">-U</span></samp><dt><samp><span class="option">--binary</span></samp><dd><a name="index-g_t_002dU-130"></a><a name="index-g_t_002d_002dbinary-131"></a><a name="index-MS_002dDOS_002fMS_002dWindows-binary-files-132"></a><a name="index-binary-files_002c-MS_002dDOS_002fMS_002dWindows-133"></a>Treat the file(s) as binary. By default, under MS-DOS and MS-Windows, -<samp><span class="command">grep</span></samp> guesses the file type -by looking at the contents of the first 32kB read from the file. +<samp><span class="command">grep</span></samp> guesses whether a file is text or binary +as described for the <samp><span class="option">--binary-files</span></samp> option. If <samp><span class="command">grep</span></samp> decides the file is a text file, it strips the <code>CR</code> characters from the original file contents (to make regular expressions with <code>^</code> and <code>$</code> work correctly).
