Skip to content

Commit 6dc7305

Browse files
authored
Merge pull request #502 from katef/kate/missing-manpage-flag
Missing documentation for -x in the rx(1) manpage
2 parents 09a917a + 280ca7c commit 6dc7305

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

man/rx.1/rx.1.xml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<!ENTITY v.opt "<option>-v</option>">
4545
<!ENTITY w.opt "<option>-w</option>">
4646
<!ENTITY X.opt "<option>-X</option>">
47+
<!ENTITY x.opt "<option>-x</option>">
4748

4849
<!ENTITY h.opt "<option>-h</option>">
4950
]>
@@ -403,29 +404,20 @@
403404
<term>&u.opt;</term>
404405

405406
<listitem>
406-
<para>Allow ambiguities.
407-
This means patterns with different ids may match the same text.
408-
The default is to error for conflicts.</para>
409-
410-
<para>It's possible to have multiple patterns with the same id
411-
(i.e. by being in the same file when using multi-file mode),
412-
and these are not considered a conflict because they key
413-
to the same id.</para>
414-
</listitem>
415-
</varlistentry>
416-
417-
<varlistentry>
418-
<term>&u.opt;</term>
407+
<para>Allow ambiguities between patterns.
408+
This means patterns with different ids may match the same text.</para>
419409

420-
<listitem>
421-
<para>Allow ambiguities between regexps,
422-
such that multiple regexps may match the same text.
423-
The default is to error for ambiguities,
410+
<para>The default is to error for ambiguities,
424411
requiring all regexps unioned to be non-overlapping.
425412
Formally, the requirement is that they are disjoint languages.
426413
Erroring for ambiguities applies after multiple regexps are joined,
427414
either by union or by concatenation (&s.opt;).</para>
428415

416+
<para>It's possible to have multiple patterns with the same id
417+
(i.e. by being in the same file when using multi-file mode),
418+
and these are not considered a conflict because they key
419+
to the same id.</para>
420+
429421
<para>&u.opt; is implied by &n.opt;.</para>
430422
</listitem>
431423
</varlistentry>
@@ -462,6 +454,17 @@
462454
</listitem>
463455
</varlistentry>
464456

457+
<varlistentry>
458+
<term>&x.opt;</term>
459+
460+
<listitem>
461+
<para>Literals are unanchored.
462+
This applies to all literals; for finer control use a regex dialect.
463+
The default is that literals are anchored,
464+
as if written <code>^abc$</code> in regex syntax.</para>
465+
</listitem>
466+
</varlistentry>
467+
465468
<varlistentry>
466469
<term>&h.opt;</term>
467470

0 commit comments

Comments
 (0)