From 370ad5e1849d4e6f5713e840d4cd38160ff80683 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 22:14:52 +0200 Subject: Documented briefly 'APT::https' group of options. --- debian/changelog | 2 ++ debian/rules | 2 +- doc/apt.conf.5.xml | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) 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 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. + https + HTTPS URIs. Cache-control and proxy options are the same as for + http method. + Pipeline-Depth option is not supported yet. + + CaInfo suboption specifies place of file that + holds info about trusted certificates. + <host>::CaInfo is corresponding per-host option. + Verify-Peer boolean suboption determines whether verify + server's host certificate against trusted certificates or not. + <host>::Verify-Peer is corresponding per-host option. + Verify-Host boolean suboption determines whether verify + server's hostname or not. + <host>::Verify-Host is corresponding per-host option. + SslCert determines what certificate to use for client + authentication. <host>::SslCert is corresponding per-host option. + SslKey determines what private key to use for client + authentication. <host>::SslKey is corresponding per-host option. + SslForceVersion overrides default SSL version to use. + Can contain 'TLSv1' or 'SSLv3' string. + <host>::SslForceVersion is corresponding per-host option. + + ftp FTP URIs; ftp::Proxy is the default proxy server to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/ and is -- cgit v1.2.3