summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:53:03 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:53:03 +0000
commit6d5dd02a49b18017c296c2d76bc6bb1d9f1ef6ac (patch)
tree109a3da8b5af3304fdc9d2e9f753edb611e54b95 /doc
parent10861bb5068971efe4de96e679a711ab45bb3e25 (diff)
Minor fixes for FTP support
Author: jgg Date: 1999-03-15 08:10:39 GMT Minor fixes for FTP support
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-get.8.yo2
-rw-r--r--doc/examples/apt.conf22
2 files changed, 22 insertions, 2 deletions
diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo
index 6209c7e07..b4a468afb 100644
--- a/doc/apt-get.8.yo
+++ b/doc/apt-get.8.yo
@@ -66,7 +66,7 @@ list of locations from which to retrieve desired package files.
dit(bf(install))
bf(install) is followed by one or more em(packages) desired for installation.
Each em(package) is a package name, not a fully qualified filename
-(for instance, in a Debian GNU/Linux system, em(lsdo) would be the argument
+(for instance, in a Debian GNU/Linux system, em(ldso) would be the argument
provided, not em(ldso_1.9.6-2.deb)). All packages required by the package(s)
specified for installation will also be retrieved and installed. The
bf(/etc/apt/sources.list) file is used to locate the desired packages. If a
diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index b4ba2ac0f..d0078cddd 100644
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.26 1999/03/02 21:19:06 jgg Exp $
+// $Id: apt.conf,v 1.27 1999/03/15 08:10:39 jgg Exp $
/* This file is an index of all APT configuration directives. It should
NOT actually be used as a real config file, though it is a completely
valid file.
@@ -66,6 +66,26 @@ Acquire
Max-Age "86400"; // 1 Day age on index files
No-Store "false"; // Prevent the cache from storing archives
};
+
+ ftp
+ {
+ Proxy "ftp://127.0.0.1/";
+ Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
+
+ // Required script to perform proxy login
+ ProxyLogin
+ {
+ "USER $(PROXY_USER)";
+ "PASS $(PROXY_PASS)";
+ "USER $(SITE_USER)@$(SITE):$(SITE_PORT)";
+ "PASS $(SITE_PASS)";
+ };
+
+ Timeout "120";
+ Passive "true";
+ Proxy::Passive "true";
+ Passive::http.us.debian.org "true"; // Specific per-host setting
+ };
cdrom
{