2 files changed, 34 insertions, 48 deletions

diff --git a/bin/check-mirrors b/bin/check-mirrors
index d206545..eaeb8d3 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -12,28 +12,34 @@
 # ANY WARRANTY, to the extent permitted by law; without even the implied
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+#mirrors='
+#    ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/
+#    ftp://ftp.lysator.liu.se/pub/nagios-plugins/
+#    ftp://ftp.belnet.be/mirror/nagios-plugins.org/
+#    ftp://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/
+#    ftp://mirrors.fe.up.pt/pub/nagios-plugins/
+#    ftp://mirror.switch.ch/mirror/nagios-plugins/
+#    ftp://mirror.bytemark.co.uk/nagios-plugins/
+#    ftp://mirror.jmu.edu/pub/nagios-plugins/
+#    ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/
+#    ftp://mirror.webtastix.net/nagios-plugins/
+#    ftp://mirror.mephi.ru/nagios-plugins/
+#    ftp://mirrors.ustc.edu.cn/nagios-plugins/
+#    ftp://ftp.kaist.ac.kr/nagios-plugins/
+#'
+
 mirrors='
     ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/
-    ftp://ftp.lysator.liu.se/pub/nagios-plugins/
-    ftp://ftp.belnet.be/mirror/nagios-plugins.org/
-    ftp://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/
-    ftp://mirrors.fe.up.pt/pub/nagios-plugins/
     ftp://mirror.switch.ch/mirror/nagios-plugins/
-    ftp://mirror.bytemark.co.uk/nagios-plugins/
-    ftp://mirror.jmu.edu/pub/nagios-plugins/
-    ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/
-    ftp://mirror.webtastix.net/nagios-plugins/
-    ftp://mirror.mephi.ru/nagios-plugins/
-    ftp://mirrors.ustc.edu.cn/nagios-plugins/
-    ftp://ftp.kaist.ac.kr/nagios-plugins/
 '
+
 #
 # Our mirrors:
 #
 # GERMANY
 #
 #   URLs:
-#   - ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/
+#   - ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -85,23 +91,6 @@ mirrors='
 #   Home page:
 #   - http://www.belnet.be/
 #
-# SWITZERLAND
-#
-#   URLs:
-#   - ftp://mirror.switch.ch/mirror/nagios-plugins/
-#   - http://mirror.switch.ch/ftp/mirror/nagios-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated daily
-#
-#   Contacts:
-#   - Kaspar Brand <switchmirror AT switch.ch>
-#
-#   Home page:
-#   - http://mirror.switch.ch/
-#
 # GREECE
 #
 #   URLs:
@@ -140,8 +129,8 @@ mirrors='
 # SWITZERLAND
 #
 #   URLs:
-#   - ftp://mirror.switch.ch/mirror/nagios-plugins/
-#   - http://mirror.switch.ch/ftp/mirror/nagios-plugins/
+#   - ftp://mirror.switch.ch/mirror/monitoring-plugins/
+#   - http://mirror.switch.ch/ftp/mirror/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
diff --git a/web/input/download.md b/web/input/download.md
index 6f09107..8881f48 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -17,11 +17,8 @@ from here:
 
 See the [release history][news] for an overview of changes between earlier
 versions.  Old releases can be found in the [download area][download].  There
-are FTP mirrors available in [Argentina][mirror-ar], [Belgium][mirror-be],
-[China][mirror-cn], [Germany][mirror-de], [Greece][mirror-gr],
-[Korea][mirror-kr], [New Zealand][mirror-nz], [Portugal][mirror-pt],
-[Russia][mirror-ru], [Sweden][mirror-se], [Switzerland][mirror-ch], the
-[UK][mirror-uk], and the [USA][mirror-us].
+are FTP mirrors available in [Germany][mirror-de] and
+[Switzerland][mirror-ch].
 
 ### Development Snapshot
 
@@ -50,18 +47,18 @@ Old versions can be found [within][mib] the [download area][download].
 
 [announcement]: {{release_notes}} "Release Announcement"
 [mirror-ar]: ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/ "FTP Mirror in Argentina"
-[mirror-be]: ftp://ftp.belnet.be/mirror/nagios-plugins.org/ "FTP Mirror in Belgium"
-[mirror-cn]: ftp://mirrors.ustc.edu.cn/nagios-plugins/ "FTP Mirror in China"
-[mirror-de]: ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/ "FTP Mirror in Germany"
-[mirror-gr]: ftp://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/ "FTP Mirror in Greece"
-[mirror-kr]: ftp://ftp.kaist.ac.kr/nagios-plugins/ "FTP Mirror in Korea"
-[mirror-nz]: ftp://mirror.webtastix.net/nagios-plugins/ "FTP Mirror in New Zealand"
-[mirror-pt]: ftp://mirrors.fe.up.pt/pub/nagios-plugins/ "FTP Mirror in Portugal"
-[mirror-ru]: ftp://mirror.mephi.ru/nagios-plugins/ "FTP Mirror in Russia"
-[mirror-se]: ftp://ftp.lysator.liu.se/pub/nagios-plugins/ "FTP Mirror in Sweden"
-[mirror-ch]: ftp://mirror.switch.ch/mirror/nagios-plugins/ "FTP Mirror in Switzerland"
-[mirror-uk]: ftp://mirror.bytemark.co.uk/nagios-plugins/ "FTP Mirror in the United Kingdom"
-[mirror-us]: ftp://mirror.jmu.edu/pub/nagios-plugins/ "FTP Mirror in the United States"
+[mirror-be]: ftp://ftp.belnet.be/mirror/monitoring-plugins.org/ "FTP Mirror in Belgium"
+[mirror-cn]: ftp://mirrors.ustc.edu.cn/monitoring-plugins/ "FTP Mirror in China"
+[mirror-de]: ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "FTP Mirror in Germany"
+[mirror-gr]: ftp://ftp.cc.uoc.gr/mirrors/nagios/monitoring-plugins/ "FTP Mirror in Greece"
+[mirror-kr]: ftp://ftp.kaist.ac.kr/monitoring-plugins/ "FTP Mirror in Korea"
+[mirror-nz]: ftp://mirror.webtastix.net/monitoring-plugins/ "FTP Mirror in New Zealand"
+[mirror-pt]: ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ "FTP Mirror in Portugal"
+[mirror-ru]: ftp://mirror.mephi.ru/monitoring-plugins/ "FTP Mirror in Russia"
+[mirror-se]: ftp://ftp.lysator.liu.se/pub/monitoring-plugins/ "FTP Mirror in Sweden"
+[mirror-ch]: ftp://mirror.switch.ch/mirror/monitoring-plugins/ "FTP Mirror in Switzerland"
+[mirror-uk]: ftp://mirror.bytemark.co.uk/monitoring-plugins/ "FTP Mirror in the United Kingdom"
+[mirror-us]: ftp://mirror.jmu.edu/pub/monitoring-plugins/ "FTP Mirror in the United States"
 [repository]: https://github.com/monitoring-plugins/monitoring-plugins "Nagios Plugins Git Repository"
 [news]: doc/news.txt "NEWS"
 [download]: download/ "Download Area"