Merge branch 'pu/netrcparts' into 'master'

Add support for /etc/apt/auth.conf.d/*.conf (netrcparts)

See merge request apt-team/apt!37

2 files changed, 7 insertions, 1 deletions

diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index 37e4fbc98..26d14b8e8 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -36,7 +36,8 @@ needed to connect to a proxy or to download data from a repository on the other
 hand shouldn't always be accessible by everyone and can hence not be placed in a
 file with world-readable file permissions.</para>
 
-<para>The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be used to store
+<para>The APT auth.conf file <filename>/etc/apt/auth.conf</filename>, and .conf files inside
+<filename>/etc/apt/auth.conf.d</filename> can be used to store
 login information in a netrc-like format with restrictive file permissions.</para>
 </refsect1>
 
@@ -119,6 +120,10 @@ you need multiple they should all have a path specified in the
 	<listitem><para>Login information for APT sources and proxies in a netrc-like format.
 	Configuration Item: <literal>Dir::Etc::netrc</literal>.</para></listitem>
      </varlistentry>
+     <varlistentry><term><filename>/etc/apt/auth.conf.d/*.conf</filename></term>
+	<listitem><para>Login information for APT sources and proxies in a netrc-like format.
+	Configuration Item: <literal>Dir::Etc::netrcparts</literal>.</para></listitem>
+     </varlistentry>
   </variablelist>
 </refsect1>
 
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 99aedfd19..3dd6e0afc 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -399,6 +399,7 @@ Dir "<DIR>"
   Etc "<DIR>" {
      Main "<FILE>";
      Netrc "<FILE>";
+     NetrcParts "<DIR>";
      Parts "<DIR>";
      Preferences "<FILE>";
      PreferencesParts "<DIR>";