Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/etc/pacman.conf.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-07 17:21:28 -0600
committerDan McGee <dan@archlinux.org>2008-01-14 22:22:30 -0600
commita0ac72b42219fbcf17dd7cf2ee992b71a6a1375a (patch)
tree13373fe776864709e3abbc2079565935db53cbda /etc/pacman.conf.in
parent9a18e0dbefd010f4505433cbf7a4d6bb40c548da (diff)
etc: remove Arch-specific mirrorlist from repo
We shouldn't have the stock config be Arch specific for a few reasons: * Although it is our package, others should be able to use it * Keeping the mirrorlist coupled to the pacman package makes it hard to push updates to users without releasing a new copy of the pacman source Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc/pacman.conf.in')
-rw-r--r--etc/pacman.conf.in32
1 files changed, 9 insertions, 23 deletions
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 26cb3399..351d23f4 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -1,7 +1,7 @@
#
# @sysconfdir@/pacman.conf
#
-# See the pacman manpage for option directives
+# See the pacman.conf(5) manpage for option and repository directives
#
# GENERAL OPTIONS
@@ -23,6 +23,7 @@ HoldPkg = pacman glibc
# - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages
# have identical names, regardless of version number
+# - URLs will have $repo replaced by the name of the current repo
#
# Repository entries are of the format:
# [repo-name]
@@ -33,28 +34,13 @@ HoldPkg = pacman glibc
# uncommented to enable the repo.
#
-# Testing is disabled by default. To enable, uncomment the following
-# two lines. You can add preferred servers immediately after the header,
-# and they will be used before the default mirrors.
-#[testing]
-#Include = @sysconfdir@/pacman.d/mirrorlist
-
-[core]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-[extra]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-[community]
-# Add your preferred servers here, they will be used first
-Include = @sysconfdir@/pacman.d/mirrorlist
-
-# Unstable is disabled by default. To enable, uncomment the following
-# two lines. You can add preferred servers immediately after the header,
-# and they will be used before the default mirrors.
-#[unstable]
+# An example of a disabled remote package repository with multiple servers
+# available. To enable, uncomment the following lines. You can add preferred
+# servers immediately after the header and they will be used before the
+# default mirrors.
+#[core]
+#Server = ftp://ftp.example.com/foobar/$repo/os/i686/
+# The file referenced here should contain a list of 'Server = ' lines.
#Include = @sysconfdir@/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for