From: Eugene V. Lyubimkin <jackyf@1501-debian>
Date: Sat, 6 Dec 2008 20:14:52 +0000 (+0200)
Subject: Documented briefly 'APT::https' group of options.
X-Git-Tag: 0.7.21~35^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/370ad5e1849d4e6f5713e840d4cd38160ff80683

Documented briefly 'APT::https' group of options.
---

diff --git a/debian/changelog b/debian/changelog
index fc8cde53b..3535ca5f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.7.20) unstable; urgency=low
       from 0.6.46.1 to 0.7.0. (Closes: #439866)
   * buildlib/config.{sub,guess}:
     - Renewed. This fixes lintian errors.
+  * doc/apt.conf.5.xml, debian/apt-transport-https:
+    - Documented briefly 'APT::https' group of options. (Closes: #507398)
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
 
diff --git a/debian/rules b/debian/rules
index f587b141a..f1eb62b57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -307,7 +307,7 @@ apt-transport-https: build debian/shlibs.local libapt-pkg-dev
 	mkdir -p debian/$@/usr/lib/apt/methods
 	cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods
 
-	dh_installdocs -p$@
+	dh_installdocs -p$@ debian/apt-transport-https.README
 	dh_installexamples -p$@
 
 	# Install the man pages..
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index ce7012460..35987f8d8 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -220,6 +220,29 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      require this are in violation of RFC 2068.</para></listitem>
      </varlistentry>
 
+     <varlistentry><term>https</term>
+	 <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for
+	 <literal>http</literal> method.
+	 <literal>Pipeline-Depth</literal> option is not supported yet.</para>
+
+	 <para><literal>CaInfo</literal> suboption specifies place of file that
+	 holds info about trusted certificates.
+	 <literal>&lt;host&gt;::CaInfo</literal> is corresponding per-host option.
+	 <literal>Verify-Peer</literal> boolean suboption determines whether verify
+	 server's host certificate against trusted certificates or not.
+	 <literal>&lt;host&gt;::Verify-Peer</literal> is corresponding per-host option.
+	 <literal>Verify-Host</literal> boolean suboption determines whether verify
+	 server's hostname or not.
+	 <literal>&lt;host&gt;::Verify-Host</literal> is corresponding per-host option.
+	 <literal>SslCert</literal> determines what certificate to use for client
+	 authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding per-host option.
+	 <literal>SslKey</literal> determines what private key to use for client
+	 authentication. <literal>&lt;host&gt;::SslKey</literal> is corresponding per-host option.
+	 <literal>SslForceVersion</literal> overrides default SSL version to use.
+	 Can contain 'TLSv1' or 'SSLv3' string.
+	 <literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host option.
+	 </para></listitem></varlistentry>
+
      <varlistentry><term>ftp</term>
      <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is