summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:39 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:39 +0000
commitc3c459fc5ec635db7e6fa7cff97f4d954cd39fc9 (patch)
tree42cab59df861d917fb146d718d807ee97bd00ab3 /doc
parent352c27685a2b9f3b5e0b9eb7b828af099fbdb934 (diff)
Make improvements
Author: jgg Date: 1998-11-23 23:17:45 GMT Make improvements
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/apt.conf11
-rw-r--r--doc/makefile5
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/examples/apt.conf b/doc/examples/apt.conf
index e89140d47..9403c424a 100644
--- a/doc/examples/apt.conf
+++ b/doc/examples/apt.conf
@@ -1,4 +1,4 @@
-// $Id: apt.conf,v 1.14 1998/11/23 01:46:01 jgg Exp $
+// $Id: apt.conf,v 1.15 1998/11/23 23:17:49 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.
@@ -38,11 +38,12 @@ Acquire
{
Queue-Mode "host"; // host|access
-/* http
+ // HTTP method configuration
+ http
{
Proxy "http://127.0.0.1:3128";
- Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
- };*/
+ Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
+ };
};
// Directory layout
@@ -80,6 +81,7 @@ Dir
};
};
+// Things that effect the APT dselect method
DSelect {
Clean "auto";
Options "-f";
@@ -96,4 +98,5 @@ Debug {
pkgDPkgPM "false";
pkgInitialize "false"; // This one will dump the configuration space
+ NoLocking "false";
}
diff --git a/doc/makefile b/doc/makefile
index 037c8a2e1..46739eff2 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -13,3 +13,8 @@ include $(DEBIANDOC_H)
# Man pages
SOURCE = apt-cache.8 apt-get.8 apt.8 sources.list.5
include $(MANPAGE_H)
+
+# Examples
+SOURCE = examples/apt.conf examples/sources.list
+TO = $(DOC)
+include $(COPY_H)