Merge branch 'maint'

1 files changed, 14 insertions, 0 deletions

diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 351d23f4..582fe942 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -16,6 +16,20 @@
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#NoPassiveFtp
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file