Merge branch 'master' into fight-entropy

Conflicts:
	english/events/Makefile

6 files changed, 6 insertions, 10 deletions

diff --git a/english/MailingLists/.cvsignore b/english/MailingLists/.cvsignore
deleted file mode 100644
index 99e87ac171d..00000000000
--- a/english/MailingLists/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-lists.cfg
-subscribe.wml
-unsubscribe.wml
diff --git a/english/MailingLists/desc/devel/debian-dpkg b/english/MailingLists/desc/devel/debian-dpkg
index 0569e002fad..a35c96d35d2 100644
--- a/english/MailingLists/desc/devel/debian-dpkg
+++ b/english/MailingLists/desc/devel/debian-dpkg
@@ -1,2 +1,2 @@
-Discussions and maintenance of dpkg, the basis of
+Discussions and maintenance of the dpkg suite, the basis of
 the Debian packaging system.
diff --git a/english/MailingLists/desc/devel/debian-dpkg-bugs b/english/MailingLists/desc/devel/debian-dpkg-bugs
index f944d1cfd71..de600f3c0d8 100644
--- a/english/MailingLists/desc/devel/debian-dpkg-bugs
+++ b/english/MailingLists/desc/devel/debian-dpkg-bugs
@@ -1,2 +1 @@
-Email sent by the bug tracking system regarding
-the dpkg packages.
+Email sent by the bug tracking system regarding the dpkg suite of packages.
diff --git a/english/MailingLists/desc/devel/debian-dpkg-cvs b/english/MailingLists/desc/devel/debian-dpkg-cvs
index b0af8db72c9..6244037f381 100644
--- a/english/MailingLists/desc/devel/debian-dpkg-cvs
+++ b/english/MailingLists/desc/devel/debian-dpkg-cvs
@@ -1 +1 @@
-The CVS commit messages from the dpkg CVS tree.
+The VCS commit messages from the GIT dpkg suite trees.
diff --git a/english/MailingLists/desc/misc/debian-rtc b/english/MailingLists/desc/misc/debian-rtc
index a04464399cb..c6e2f700b65 100644
--- a/english/MailingLists/desc/misc/debian-rtc
+++ b/english/MailingLists/desc/misc/debian-rtc
@@ -1,6 +1,5 @@
-Debian operates a number of <a href="https://rtc.debian.org">RTC services</a>
+Debian operates a number of RTC services (https://rtc.debian.org)
 for Debian Developers and the wider Debian community.  This list is provided
-for discussion of the services, discussing <a
-href="https://wiki.debian.org/UnifiedCommunications/DebianDevelopers">documentation</a>
+for discussion of the services, discussing documentation (https://wiki.debian.org/UnifiedCommunications/DebianDevelopers)
 for the services, operational issues, discussion of possible enhancements and
 questions from users.
diff --git a/english/MailingLists/mklist b/english/MailingLists/mklist
index d1f9ff04917..5dc7fc42880 100755
--- a/english/MailingLists/mklist
+++ b/english/MailingLists/mklist
@@ -365,6 +365,7 @@ END
 				$list{$l}->{'Description'} =~ s/>/&gt;/g;
 				$list{$l}->{'Description'} =~ s/</&lt;/g;
 				$list{$l}->{'Description'} =~ s,(http://[\w.\-~/#]*),<a href="$1">$1</a>,g;
+				$list{$l}->{'Description'} =~ s,(https://[\w.\-~/#]*),<a href="$1">$1</a>,g;
 				$list{$l}->{'Description'} =~ s,(listmaster@[\w.-]*),<a href="mailto:$1">$1</a>,g;
 				$list{$l}->{'Description'} =~ s,(majordomo@[\w.-]*),<a href="mailto:$1">$1</a>,g;
 				my @lines = split(/\n/,$list{$l}->{'Description'});