diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 13 | ||||
| -rw-r--r-- | doc/apt.8.xml | 9 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b757c3d30..fca682015 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -205,6 +205,19 @@ option if you want to change that.</para></listitem> </varlistentry> + <varlistentry><term><option>satisfy</option></term> + <listitem><para><literal>satisfy</literal> causes apt-get to satisfy the given dependency string.s The + dependency strings may have build profiles and architecture restriction list as in build dependencies. They + may optionally be prefixed with <literal>"Conflicts: "</literal> to unsatisfy the dependency string. Multiple strings of the same type can be specified.</para> + + <para>Example: <literal>apt-get satisfy "foo" "Conflicts: bar" "baz (>> 1.0) | bar (= 2.0), moo"</literal></para> + + <para>The legacy operator '</>' is not supported, use '<=/>=' instead.</para> + + + </listitem> + </varlistentry> + <varlistentry><term><option>check</option></term> <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks for broken dependencies.</para></listitem> diff --git a/doc/apt.8.xml b/doc/apt.8.xml index e43ad9e9e..0c822b4ef 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -109,6 +109,15 @@ </para></listitem> </varlistentry> + <varlistentry><term><option>satisfy</option> (&apt-get;)</term> + <listitem><para><option>satisfy</option> satisfies dependency strings, as + used in Build-Depends. It also handles conflicts, by prefixing an argument + with <literal>"Conflicts: "</literal>. + </para><para>Example: <literal>apt satisfy "foo, bar (>= 1.0)" "Conflicts: baz, fuzz"</literal> + </para></listitem> + </varlistentry> + + <varlistentry><term><option>search</option> (&apt-cache;)</term> <listitem><para><option>search</option> can be used to search for the given ®ex; term(s) in the list of available packages and display diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5e317d7e0..25378a809 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -63,6 +63,7 @@ APT Arch-Only "<BOOL>"; Indep-Only "<BOOL>"; Build-Dep-Automatic "<BOOL>"; + Satisfy-Automatic "<BOOL>"; // (non-)confirming options Force-Yes "<BOOL>"; // allows downgrades, essential removal and eats children |