summaryrefslogtreecommitdiff
path: root/doc/apt-get.8.xml
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-09-23 17:11:41 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-09-23 17:11:41 +0200
commitf7d6459db697c6dbba8e5d787a817e7721bfb577 (patch)
treedf35974a4902758ad2e9e03720a463bc13bdefb4 /doc/apt-get.8.xml
parent73b1d4847befc0d3042b6689484e0f74667aba6e (diff)
parenta874991b8549397fb26c47bbf229854556a3fb60 (diff)
merged from david, many thanks
Diffstat (limited to 'doc/apt-get.8.xml')
-rw-r--r--doc/apt-get.8.xml55
1 files changed, 8 insertions, 47 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b87e17247..ec773edeb 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -384,9 +384,9 @@
Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
<para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
- automatical. Also a notice will be displayed indicating that this is only a simulation,
- if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true)
- Neigther NoLocking nor the notice will be triggered if run as root (root should know what
+ automatic. Also a notice will be displayed indicating that this is only a simulation,
+ if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true).
+ Neither NoLocking nor the notice will be triggered if run as root (root should know what
he is doing without further warnings by <literal>apt-get</literal>).</para>
<para>Simulate prints out
@@ -558,50 +558,11 @@
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
- <listitem><para>Locations to fetch packages from.
- Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
- <listitem><para>APT configuration file.
- Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
- <listitem><para>APT configuration file fragments.
- Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/preferences</filename></term>
- <listitem><para>Version preferences file.
- This is where you would specify "pinning",
- i.e. a preference to get certain packages
- from a separate source
- or from a different version of a distribution.
- Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&cachedir;/archives/</filename></term>
- <listitem><para>Storage area for retrieved package files.
- Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
- <listitem><para>Storage area for package files in transit.
- Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/</filename></term>
- <listitem><para>Storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
- <listitem><para> Storage area for state information in transit.
- Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
- </varlistentry>
+ &file-sourceslist;
+ &file-aptconf;
+ &file-preferences;
+ &file-cachearchives;
+ &file-statelists;
</variablelist>
</refsect1>