X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=7991a0088b7ca084f16340c2a00093038001fe87;hb=8f2b1802ba79cc398b93894ac9b1568d4beafe40;hp=20710021747d5fb5eacd16d173f11531e1ab22cb;hpb=353000ffb797d38970738f4454ea46be66e061ec;p=developers-reference.git

diff --git a/common.ent b/common.ent
index 2071002..7991a00 100644
--- a/common.ent
+++ b/common.ent
@@ -19,7 +19,7 @@
 <!ENTITY fsf-addr "Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA">
 <!ENTITY file-GPL "<filename>/usr/share/common-licenses/GPL-2</filename>">
-<!ENTITY debian-formal "Debian GNU/Linux">
+<!ENTITY debian-formal "Debian">
 
 <!--
      URLs, Debian
@@ -42,94 +42,92 @@
 <!ENTITY ftp-master-mirror "ries.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
-<!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
-<!ENTITY url-perl-policy "http://&www-debian-org;/doc/packaging-manuals/perl-policy/">
-<!ENTITY url-emacs-policy "http://&www-debian-org;/doc/packaging-manuals/debian-emacs-policy">
-<!ENTITY url-java-policy "http://&www-debian-org;/doc/packaging-manuals/java-policy/">
+<!ENTITY url-debian-policy "https://&www-debian-org;/doc/debian-policy/">
+<!ENTITY url-perl-policy "https://&www-debian-org;/doc/packaging-manuals/perl-policy/">
+<!ENTITY url-emacs-policy "https://&www-debian-org;/doc/packaging-manuals/debian-emacs-policy">
+<!ENTITY url-java-policy "https://&www-debian-org;/doc/packaging-manuals/java-policy/">
 <!ENTITY url-libpkg-guide "http://www.netfort.gr.jp/~dancer/column/libpkg-guide/">
 
-<!ENTITY url-social-contract "http://&www-debian-org;/social_contract">
-<!ENTITY url-constitution "http://&www-debian-org;/devel/constitution">
+<!ENTITY url-social-contract "https://&www-debian-org;/social_contract">
+<!ENTITY url-constitution "https://&www-debian-org;/devel/constitution">
 <!ENTITY url-dfsg "&url-social-contract;#guidelines">
-<!ENTITY url-debian-lists "http://&www-debian-org;/MailingLists/">
+<!ENTITY url-debian-lists "https://&www-debian-org;/MailingLists/">
 <!ENTITY url-debian-lists-new "&url-debian-lists;HOWTO_start_list">
-<!ENTITY url-bts "http://&www-debian-org;/Bugs/">
+<!ENTITY url-bts "https://&www-debian-org;/Bugs/">
 <!ENTITY url-bts-report "&url-bts;Reporting">
 <!ENTITY url-bts-devel "&url-bts;Developer">
 <!ENTITY url-bts-control "&url-bts;server-control">
-<!ENTITY url-debian-mirrors "http://&www-debian-org;/mirror/">
-<!ENTITY url-debian-ports "http://&www-debian-org;/ports/">
-<!ENTITY url-debian-port-lists "http://&lists-host;/ports.html">
-<!ENTITY url-wnpp "http://&www-debian-org;/devel/wnpp/">
-<!ENTITY url-devel-docs "http://&www-debian-org;/devel/">
-<!ENTITY url-vote "http://&www-debian-org;/vote/">
-<!ENTITY url-cvsweb "http://cvs.debian.org/">
-<!ENTITY url-devel-machines "http://db.debian.org/machines.cgi">
-<!ENTITY url-buildd "http://buildd.debian.org/">
-<!ENTITY url-release-wb "http://release.debian.org/wanna-build.txt">
-<!ENTITY url-wb-team "http://lists.debian.org/debian-project/2009/03/msg00096.html">
-<!ENTITY url-lintian "http://lintian.debian.org/">
-<!ENTITY url-debian-qa "http://qa.debian.org/">
+<!ENTITY url-debian-mirrors "https://&www-debian-org;/mirror/">
+<!ENTITY url-debian-ports "https://&www-debian-org;/ports/">
+<!ENTITY url-debian-port-lists "https://&lists-host;/ports.html">
+<!ENTITY url-wnpp "https://&www-debian-org;/devel/wnpp/">
+<!ENTITY url-devel-docs "https://&www-debian-org;/devel/">
+<!ENTITY url-vote "https://&www-debian-org;/vote/">
+<!ENTITY url-cvsweb "https://cvs.debian.org/">
+<!ENTITY url-devel-machines "https://db.debian.org/machines.cgi">
+<!ENTITY url-buildd "https://buildd.debian.org/">
+<!ENTITY url-release-wb "https://release.debian.org/wanna-build.txt">
+<!ENTITY url-wb-team "https://lists.debian.org/debian-project/2009/03/msg00096.html">
+<!ENTITY url-lintian "https://lintian.debian.org/">
+<!ENTITY url-debian-qa "https://qa.debian.org/">
 <!ENTITY url-debian-qa-orphaned "&url-debian-qa;orphaned.html">
 <!ENTITY url-debian-db "https://db.debian.org/">
 <!ENTITY url-debian-db-login "&url-debian-db;login.html">
-<!ENTITY url-debian-db-mail-gw "http://db.debian.org/doc-mail.html">
-<!ENTITY url-debian-db-doc "http://db.debian.org/doc-general.html">
+<!ENTITY url-debian-db-mail-gw "https://db.debian.org/doc-mail.html">
+<!ENTITY url-debian-db-doc "https://db.debian.org/doc-general.html">
 <!ENTITY url-newmaint "&url-devel-docs;join/newmaint">
-<!ENTITY url-newmaint-db "http://nm.debian.org/">
+<!ENTITY url-newmaint-db "https://nm.debian.org/">
 <!ENTITY url-newmaint-advocate "&url-devel-docs;join/nm-advocate">
 <!ENTITY url-newmaint-amchecklist "&url-devel-docs;join/nm-amchecklist">
-<!ENTITY url-newmaint-apply "http://nm.debian.org/newnm.php">
-<!ENTITY url-newmaint-id "http://&www-debian-org;/devel/join/nm-step2">
-<!ENTITY url-newmaint-guide "http://&www-debian-org;/doc/maint-guide/">
-<!ENTITY url-gpg-coord "http://wiki.debian.org/Keysigning">
-<!ENTITY url-debian-security-advisories "http://&www-debian-org;/security/">
-<!ENTITY url-tech-ctte "http://&www-debian-org;/devel/tech-ctte">
-<!ENTITY url-ddpo "http://qa.debian.org/developer.php">
-<!ENTITY url-dcg "http://people.debian.org/~enrico/dcg/">
+<!ENTITY url-newmaint-apply "https://nm.debian.org/newnm.php">
+<!ENTITY url-newmaint-id "https://&www-debian-org;/devel/join/nm-step2">
+<!ENTITY url-newmaint-guide "https://&www-debian-org;/doc/maint-guide/">
+<!ENTITY url-gpg-coord "https://wiki.debian.org/Keysigning">
+<!ENTITY url-debian-security-advisories "https://&www-debian-org;/security/">
+<!ENTITY url-tech-ctte "https://&www-debian-org;/devel/tech-ctte">
+<!ENTITY url-ddpo "https://qa.debian.org/developer.php">
+<!ENTITY url-dcg "https://people.debian.org/~enrico/dcg/">
 <!ENTITY url-rt "https://rt.debian.org/">
-<!ENTITY url-wiki-dm "http://wiki.debian.org/DebianMaintainer">
-<!ENTITY url-i18n-doc-check "http://svn.debian.org/wsvn/d-i/trunk/manual/scripts/doc-check?op=file">
-<!ENTITY url-i18n-l10n "http://people.debian.org/~jfs/debconf6/html/">
-<!ENTITY url-i18n-intro "http://&www-debian-org;/doc/manuals/intro-i18n/">
+<!ENTITY url-wiki-dm "https://wiki.debian.org/DebianMaintainer">
+<!ENTITY url-i18n-doc-check "https://svn.debian.org/viewvc/d-i/trunk/manual/scripts/doc-check?view=co">
+<!ENTITY url-i18n-l10n "https://people.debian.org/~jfs/debconf6/html/">
+<!ENTITY url-i18n-intro "https://&www-debian-org;/doc/manuals/intro-i18n/">
 <!ENTITY url-ddtp "http://ddtp.debian.net/">
-<!ENTITY url-l10n "http://&www-debian-org;/intl/l10n/">
+<!ENTITY url-l10n "https://&www-debian-org;/intl/l10n/">
 <!ENTITY url-dep3 "http://dep.debian.net/deps/dep3/">
 
 <!ENTITY url-incoming "http://incoming.debian.org/">
-<!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
-<!ENTITY url-low-threshold-nmu "http://wiki.debian.org/LowThresholdNmu">
-<!ENTITY url-orphaned-not-qa "http://qa.debian.org/orphaned.html">
-<!ENTITY url-dehs "http://dehs.alioth.debian.org/">
-<!ENTITY url-buildd-p-a-s "http://buildd.debian.org/quinn-diff/Packages-arch-specific">
+<!ENTITY url-testing-maint "https://www.debian.org/devel/testing">
+<!ENTITY url-low-threshold-nmu "https://wiki.debian.org/LowThresholdNmu">
+<!ENTITY url-orphaned-not-qa "https://qa.debian.org/orphaned.html">
+<!ENTITY url-dehs "https://dehs.alioth.debian.org/">
+<!ENTITY url-buildd-p-a-s "https://buildd.debian.org/quinn-diff/Packages-arch-specific">
 
 <!-- deprecated -->
 
-<!ENTITY url-mentors "http://wiki.debian.org/DebianMentorsFaq">
+<!ENTITY url-mentors "https://wiki.debian.org/DebianMentorsFaq">
 
-<!ENTITY url-rules-files "http://arch.debian.org/arch/private/srivasta/">
+<!ENTITY url-dmup "https://&www-debian-org;/devel/dmup">
+<!ENTITY url-worldmap "https://&www-debian-org;/devel/developers.loc">
 
-<!ENTITY url-dmup "http://&www-debian-org;/devel/dmup">
-<!ENTITY url-worldmap "http://&www-debian-org;/devel/developers.loc">
+<!ENTITY url-eg-desc-upstream-info "https://&packages-host;/unstable/web/wml">
 
-<!ENTITY url-eg-desc-upstream-info "http://&packages-host;/unstable/web/wml">
-
-<!ENTITY url-alioth "http://alioth.debian.org/">
-<!ENTITY url-alioth-pkg "http://wiki.debian.org/Alioth/PackagingProject">
-<!ENTITY url-alioth-wiki "http://wiki.debian.org/Alioth">
-<!ENTITY url-alioth-faq "http://wiki.debian.org/Alioth/FAQ">
+<!ENTITY url-alioth "https://alioth.debian.org/">
+<!ENTITY url-alioth-pkg "https://wiki.debian.org/Alioth/PackagingProject">
+<!ENTITY url-alioth-wiki "https://wiki.debian.org/Alioth">
+<!ENTITY url-alioth-faq "https://wiki.debian.org/Alioth/FAQ">
 
 <!-- 
      URLs, non-debian
   -->
-<!ENTITY url-gnu-manifesto "http://www.gnu.org/gnu/manifesto.html">
-<!ENTITY url-gpl "http://www.gnu.org/copyleft/gpl.html">
+<!ENTITY url-gnu-manifesto "https://www.gnu.org/gnu/manifesto.html">
+<!ENTITY url-gpl "https://www.gnu.org/copyleft/gpl.html">
 <!ENTITY url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
-<!ENTITY url-rfc2440 "http://www.rfc-editor.org/rfc/rfc2440.txt">
-<!ENTITY url-openprojects "http://www.freenode.net/">
+<!ENTITY url-rfc2440 "https://www.rfc-editor.org/rfc/rfc2440.txt">
+<!ENTITY url-openprojects "https://www.freenode.net/">
 <!ENTITY url-oftc "http://www.oftc.net/oftc/">
-<!ENTITY url-l10n-tp "http://translationproject.org/">
-<!ENTITY url-l10n-gnome "http://live.gnome.org/TranslationProject">
+<!ENTITY url-l10n-tp "https://translationproject.org/html/welcome.html">
+<!ENTITY url-l10n-gnome "https://wiki.gnome.org/TranslationProject">
 <!ENTITY url-l10n-kde "http://i18n.kde.org/">
 
 <!-- Debian email addresses -->
@@ -141,6 +139,7 @@
 <!ENTITY email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
 <!ENTITY email-debian-devel-changes "<email>debian-devel-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel-req "<email>debian-devel-REQUEST@&lists-host;</email>">
+<!ENTITY email-debian-experimental-changes "<email>debian-experimental-changes@&lists-host;</email>">
 <!ENTITY email-debian-i18n "<email>debian-i18n@&lists-host;</email>">
 <!ENTITY email-debian-mentors "<email>debian-mentors@&lists-host;</email>">
 <!ENTITY email-debian-private "<email>debian-private@&lists-host;</email>">