merged -r1875..1886 from lp:~donkult/apt/sid

8 files changed, 51 insertions, 16 deletions

diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 35412d7c9..3f6cc78f5 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -80,7 +80,7 @@
 
        <varlistentry><term>showauto</term>
 	 <listitem><para><literal>showauto</literal> is used to print a
-     list of manually installed packages with each package on a new line.
+     list of automatically installed packages with each package on a new line.
        </para></listitem>
        </varlistentry>
      </variablelist>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index a12524328..0cd63b31c 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -156,11 +156,22 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term>Immediate-Configure</term>
-     <listitem><para>Disable Immediate Configuration; This dangerous option disables some
-     of APT's ordering code to cause it to make fewer dpkg calls. Doing
-     so may be necessary on some extremely slow single user systems but 
-     is very dangerous and may cause package install scripts to fail or worse.
-     Use at your own risk.</para></listitem>
+     <listitem><para>Defaults to on which will cause APT to install essential and important packages
+     as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing
+     &dpkg; call: If this option is disabled APT doesn't treat an important package in the same way as
+     an extra package: Between the unpacking of the important package A and his configuration can then
+     be many other unpack or configuration calls, e.g. for package B which has no relation to A, but
+     causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results
+     in a system state in which package A is unpacked but unconfigured - each package depending on A is now no
+     longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker
+     is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle
+     as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible
+     that APT encounters a situation in which it is unable to perform immediate configuration, error out and
+     refers to this option so the user can deactivate the immediate configuration temporary to be able to perform
+     an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
+     in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package
+     in question, so you should not blindly disable this option as the mentioned scenario above is not the only
+     problem immediate configuration can help to prevent in the first place.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>Force-LoopBreak</term>
diff --git a/doc/guide.it.sgml b/doc/it/guide.it.sgml
index 2dc46e263..2dc46e263 100644
--- a/doc/guide.it.sgml
+++ b/doc/it/guide.it.sgml
diff --git a/doc/it/makefile b/doc/it/makefile
new file mode 100644
index 000000000..2179ec15f
--- /dev/null
+++ b/doc/it/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/it
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Language Code of this translation
+LC=it
+
+include $(PO4A_MANPAGE_H)
diff --git a/doc/makefile b/doc/makefile
index 2a2663fb3..fe53aba48 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -7,8 +7,8 @@ SUBDIRS= $(dir $(wildcard */makefile))
 include ../buildlib/defaults.mak
 
 # Debian Doc SGML Documents
-SOURCE = dpkg-tech.sgml design.sgml files.sgml guide.sgml guide.it.sgml \
-         cache.sgml method.sgml offline.sgml
+SOURCE = $(wildcard *.sgml)
+DEBIANDOC_HTML_OPTIONS=-l en
 include $(DEBIANDOC_H)
 
 # XML man pages
diff --git a/doc/pl/makefile b/doc/pl/makefile
index 94939e156..7e77b29b9 100644
--- a/doc/pl/makefile
+++ b/doc/pl/makefile
@@ -5,7 +5,7 @@ SUBDIR=doc/pl
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-# Debian Doc SGML Documents
-SOURCE = offline.pl.sgml
-DEBIANDOC_HTML_OPTIONS=-l pl
-include $(DEBIANDOC_H)
+# Language Code of this translation
+LC=pl
+
+include $(PO4A_MANPAGE_H)
diff --git a/doc/po4a.conf b/doc/po4a.conf
index edf8d0357..12f2465bc 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -33,6 +33,11 @@
                 add_$lang:$lang/addendum/xml_$lang.add
 [type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
                 add_$lang:$lang/addendum/xml_$lang.add
+
+[type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml \
+                add_$lang::$lang/addendum/debiandoc_$lang.add
+[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml \
+                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    cache.sgml $lang:$lang/cache.$lang.sgml \
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    design.sgml $lang:$lang/design.$lang.sgml\
@@ -41,10 +46,6 @@
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    files.sgml $lang:$lang/files.$lang.sgml\
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    method.sgml $lang:$lang/method.$lang.sgml\
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index c758be61f..379112c83 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -174,6 +174,18 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     <command>dd</command> 
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>
+
+    <varlistentry><term>more recongnizable URI types</term>
+    <listitem><para>
+    APT can be extended with more methods shipped in other optional packages which should
+    follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
+    The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
+    provides access methods for https-URIs with features similiar to the http method, but other
+    methods for using e.g. debtorrent are also available, see <citerefentry>
+    <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
+    <manvolnum>1</manvolnum></citerefentry>.
+    </para></listitem>
+    </varlistentry>
   </variablelist>
  </para>
  </refsect1>