diff options
| author | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-12-06 22:14:52 +0200 |
|---|---|---|
| committer | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-12-06 22:14:52 +0200 |
| commit | 370ad5e1849d4e6f5713e840d4cd38160ff80683 (patch) | |
| tree | b35a5434b4695fc1f115606a136fbc70adf95083 | |
| parent | bd3849e894a4e7623426bb3995cf2e814b08a561 (diff) | |
Documented briefly 'APT::https' group of options.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 23 |
3 files changed, 26 insertions, 1 deletions
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><host>::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><host>::Verify-Peer</literal> is corresponding per-host option. + <literal>Verify-Host</literal> boolean suboption determines whether verify + server's hostname or not. + <literal><host>::Verify-Host</literal> is corresponding per-host option. + <literal>SslCert</literal> determines what certificate to use for client + authentication. <literal><host>::SslCert</literal> is corresponding per-host option. + <literal>SslKey</literal> determines what private key to use for client + authentication. <literal><host>::SslKey</literal> is corresponding per-host option. + <literal>SslForceVersion</literal> overrides default SSL version to use. + Can contain 'TLSv1' or 'SSLv3' string. + <literal><host>::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 |