summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2020-01-15 22:02:32 +0000
committerJulian Andres Klode <jak@debian.org>2020-01-15 22:02:32 +0000
commit087c97b7959acb1f9417b0b02be58709666476dc (patch)
tree9dca81e85bb4f433dfdf6ce4f3862ef4177841ae /doc
parenta9916c3faa2b8c6fa288599efec65868d050b0ef (diff)
parent21cb4a9e513ccb6f376fbcaf67957c4851cbbe32 (diff)
Merge branch 'pu/apt-regex-cli' into 'master'
apt(8): Disable regular expressions and fnmatch See merge request apt-team/apt!95
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-get.8.xml5
-rw-r--r--doc/apt-verbatim.ent6
-rw-r--r--doc/examples/configure-index1
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index ab6074802..2cec32e9a 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -140,7 +140,10 @@
to all package names in the database. Any matches are then installed (or
removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
and 'lowest'. If this is undesired, anchor the regular expression
- with a '^' or '$' character, or create a more specific regular expression.</para></listitem>
+ with a '^' or '$' character, or create a more specific regular expression.</para>
+ <para>Fallback to regular expressions is deprecated in APT 2.0, has been removed in
+ &apt;, except for anchored expressions, and will be removed from &apt-get;
+ in a future version. Use &apt-patterns; instead.</para></listitem>
</varlistentry>
<varlistentry><term><option>reinstall</option></term>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6fce0d257..e4391757c 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -57,6 +57,12 @@
</citerefentry>"
>
+<!ENTITY apt-patterns "<citerefentry>
+ <refentrytitle><abbrev>apt-patterns</abbrev></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
<!ENTITY apt-preferences "<citerefentry>
<refentrytitle><filename>apt_preferences</filename></refentrytitle>
<manvolnum>5</manvolnum>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 25378a809..cc70465d6 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -695,6 +695,7 @@ apt::cmd::list-include-summary "<BOOL>";
apt::cmd::use-regexp "<BOOL>";
apt::cmd::all-versions "<BOOL>";
apt::cmd::format "<STRING>";
+apt::cmd::pattern-only "<BOOL>"; // internal
apt::config::dump::emptyvalue "<BOOL>";
apt::config::dump::format "<STRING>";