[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to grep/manual/grep.html,v
|
From: |
Jim Meyering |
|
Subject: |
Changes to grep/manual/grep.html,v |
|
Date: |
Mon, 3 Oct 2016 02:37:10 +0000 (UTC) |
CVSROOT: /webcvs/grep
Module name: grep
Changes by: Jim Meyering <meyering> 16/10/03 02:37:09
Index: grep.html
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- grep.html 22 Apr 2016 05:25:45 -0000 1.24
+++ grep.html 3 Oct 2016 02:37:08 -0000 1.25
@@ -11,12 +11,12 @@
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license is included in the section entitled
"GNU Free Documentation License". -->
-<!-- Created by GNU Texinfo 6.0, http://www.gnu.org/software/texinfo/ -->
+<!-- Created by GNU Texinfo 6.3, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>GNU Grep 2.25</title>
+<title>GNU Grep 2.26</title>
-<meta name="description" content="GNU Grep 2.25">
-<meta name="keywords" content="GNU Grep 2.25">
+<meta name="description" content="GNU Grep 2.26">
+<meta name="keywords" content="GNU Grep 2.26">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="makeinfo">
@@ -24,7 +24,7 @@
<link href="#Top" rel="start" title="Top">
<link href="#Index" rel="index" title="Index">
<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="dir.html#Top" rel="up" title="(dir)">
+<link href="/manual" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -46,9 +46,8 @@
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: inherit; font-size: smaller}
pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space: nowrap}
span.nolinebreak {white-space: nowrap}
-span.roman {font-family: serif; font-weight: normal}
+span.roman {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
@@ -59,7 +58,7 @@
</head>
<body lang="en">
-<h1 class="settitle" align="center">GNU Grep 2.25</h1>
+<h1 class="settitle" align="center">GNU Grep 2.26</h1>
@@ -116,14 +115,14 @@
<a name="Top"></a>
<div class="header">
<p>
-Next: <a href="#Introduction" accesskey="n" rel="next">Introduction</a>, Up:
<a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Index" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Introduction" accesskey="n" rel="next">Introduction</a>, Up:
<a href="/manual" accesskey="u" rel="up">(dir)</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Index" title="Index" rel="index">Index</a>]</p>
</div>
<a name="grep"></a>
<h1 class="top">grep</h1>
<p><code>grep</code> prints lines that contain a match for a pattern.
</p>
-<p>This manual is for version 2.25 of GNU Grep.
+<p>This manual is for version 2.26 of GNU Grep.
</p>
<p>This manual is for <code>grep</code>, a pattern matching engine.
</p>
@@ -481,6 +480,7 @@
done
</pre></div>
+<a name="index-context-lines"></a>
<p>When <code>grep</code> stops after <var>num</var> matching lines,
it outputs any trailing context lines.
Since context does not include matching lines,
@@ -666,8 +666,11 @@
<a name="Context-Line-Control-1"></a>
<h4 class="subsection">2.1.5 Context Line Control</h4>
-<p>Regardless of how these options are set,
-<code>grep</code> will never print any given line more than once.
+<a name="index-context-lines-1"></a>
+<p><em>Context lines</em> are non-matching lines that are near a matching line.
+They are output only if one of the following options are used.
+Regardless of how these options are set,
+<code>grep</code> never outputs any given line more than once.
If the <samp>-o</samp> (<samp>--only-matching</samp>) option is specified,
these options have no effect and a warning is given upon their use.
</p>
@@ -696,7 +699,7 @@
<dd><a name="index-_002dC"></a>
<a name="index-_002d_002dcontext"></a>
<a name="index-_002dnum"></a>
-<a name="index-context"></a>
+<a name="index-context-lines-2"></a>
<p>Print <var>num</var> lines of leading and trailing output context.
</p>
</dd>
@@ -773,18 +776,19 @@
improperly encoded for the current locale (see <a
href="#Environment-Variables">Environment Variables</a>), or null input bytes
when the
<samp>-z</samp> (<samp>--null-data</samp>) option is not given (see <a
href="#Other-Options">Other Options</a>).
</p>
-<p>By default, <var>type</var> is ‘<samp>binary</samp>’, and when
<code>grep</code>
-discovers that a file is binary it suppresses any further output, and
-instead outputs either a one-line message saying that a binary file
-matches, or no message if there is no match.
+<p>By default, <var>type</var> is ‘<samp>binary</samp>’, and
<code>grep</code>
+suppresses output afer null input binary data is discovered,
+and suppresses output lines that contain improperly encoded data.
+When some output is suppressed, <code>grep</code> follows any output
+with a one-line message saying that a binary file matches.
</p>
<p>If <var>type</var> is ‘<samp>without-match</samp>’,
-when <code>grep</code> discovers that a file is binary
+when <code>grep</code> discovers null input binary data
it assumes that the rest of the file does not match;
this is equivalent to the <samp>-I</samp> option.
</p>
<p>If <var>type</var> is ‘<samp>text</samp>’,
-<code>grep</code> processes a binary file as if it were text;
+<code>grep</code> processes binary data as if it were text;
this is equivalent to the <samp>-a</samp> option.
</p>
<p>When <var>type</var> is ‘<samp>binary</samp>’,
<code>grep</code> may treat non-text
@@ -2843,7 +2847,9 @@
<tr><td></td><td valign="top"><a href="#index-character-type">character
type</a>:</td><td> </td><td valign="top"><a
href="#Environment-Variables">Environment Variables</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-classes-of-characters">classes
of characters</a>:</td><td> </td><td valign="top"><a
href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket
Expressions</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-cntrl-character-class"><code>cntrl <span class="roman">character
class</span></code></a>:</td><td> </td><td valign="top"><a
href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket
Expressions</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-context">context</a>:</td><td> </td><td valign="top"><a
href="#Context-Line-Control">Context Line Control</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-context-lines">context
lines</a>:</td><td> </td><td valign="top"><a
href="#General-Output-Control">General Output Control</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-context-lines-1">context
lines</a>:</td><td> </td><td valign="top"><a
href="#Context-Line-Control">Context Line Control</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-context-lines-2">context
lines</a>:</td><td> </td><td valign="top"><a
href="#Context-Line-Control">Context Line Control</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-context-lines_002c-after-match">context lines, after
match</a>:</td><td> </td><td valign="top"><a
href="#Context-Line-Control">Context Line Control</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-context-lines_002c-before-match">context lines, before
match</a>:</td><td> </td><td valign="top"><a
href="#Context-Line-Control">Context Line Control</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-control-characters">control
characters</a>:</td><td> </td><td valign="top"><a
href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket
Expressions</a></td></tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Changes to grep/manual/grep.html,v,
Jim Meyering <=