Skip to content

Commit

Permalink
Merge pull request #502 from katef/kate/missing-manpage-flag
Browse files Browse the repository at this point in the history
Missing documentation for -x in the rx(1) manpage
  • Loading branch information
katef authored Oct 23, 2024
2 parents 09a917a + 280ca7c commit 6dc7305
Showing 1 changed file with 20 additions and 17 deletions.
37 changes: 20 additions & 17 deletions man/rx.1/rx.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<!ENTITY v.opt "<option>-v</option>">
<!ENTITY w.opt "<option>-w</option>">
<!ENTITY X.opt "<option>-X</option>">
<!ENTITY x.opt "<option>-x</option>">

<!ENTITY h.opt "<option>-h</option>">
]>
Expand Down Expand Up @@ -403,29 +404,20 @@
<term>&u.opt;</term>

<listitem>
<para>Allow ambiguities.
This means patterns with different ids may match the same text.
The default is to error for conflicts.</para>

<para>It's possible to have multiple patterns with the same id
(i.e. by being in the same file when using multi-file mode),
and these are not considered a conflict because they key
to the same id.</para>
</listitem>
</varlistentry>

<varlistentry>
<term>&u.opt;</term>
<para>Allow ambiguities between patterns.
This means patterns with different ids may match the same text.</para>

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

<para>It's possible to have multiple patterns with the same id
(i.e. by being in the same file when using multi-file mode),
and these are not considered a conflict because they key
to the same id.</para>

<para>&u.opt; is implied by &n.opt;.</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -462,6 +454,17 @@
</listitem>
</varlistentry>

<varlistentry>
<term>&x.opt;</term>

<listitem>
<para>Literals are unanchored.
This applies to all literals; for finer control use a regex dialect.
The default is that literals are anchored,
as if written <code>^abc$</code> in regex syntax.</para>
</listitem>
</varlistentry>

<varlistentry>
<term>&h.opt;</term>

Expand Down

0 comments on commit 6dc7305

Please sign in to comment.