[nongnu] elpa/drupal-mode 690f2c5592 293/308: Cleanup URLs in documentation

[ELPA Syncer]

branch: elpa/drupal-mode
commit 690f2c55922a3196f6a56874287386db71009219
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>

    Cleanup URLs in documentation
---
 Cask               |  2 +-
 Makefile           |  6 +++---
 README.md          | 40 ++++++++++++++++++----------------------
 drush-make-mode.el |  4 ++--
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Cask b/Cask
index efad37c367..3347780c34 100644
--- a/Cask
+++ b/Cask
@@ -1,3 +1,3 @@
 (package-file "drupal-mode.el")
 
-(source marmalade)
+(source melpa)
diff --git a/Makefile b/Makefile
index 808de21563..3cc4c1425f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # This file is part of Drupal mode.
 
-# Copyright (C) 2012, 2013 Arne Jørgensen
+# Copyright (C) 2012, 2013, 2020 Arne Jørgensen
 
 # Author: Arne Jørgensen <arne@arnested.dk>
 
@@ -42,9 +42,9 @@ README: README.md
        $(PANDOC) -t plain -o $@ $^
 
 $(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
-       $(CASK) package
+       $(CASK) pkg-file
 
-# create a tar ball in package.el format for uploading to 
http://marmalade-repo.org
+# create a tar ball in package.el format
 $(PACKAGE_NAME).tar: README $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el 
$(ARCHIVE_NAME).info dir drupal/*.el drupal-tests.el drush-make-mode.el
        $(TAR) -c -s "@^@$(PACKAGE_NAME)/@" -f $(PACKAGE_NAME).tar $^
 
diff --git a/README.md b/README.md
index db678f1152..a1836575db 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,9 @@ below) and depend on a few through the packaging system
 ## Installation
 
 The easiest way to install Drupal mode is probably to install it via
-the ELPA archive at
-[Marmalade](http://marmalade-repo.org/packages/drupal-mode) or
-[MELPA Stable](http://stable.melpa.org/#/drupal-mode) (if you want
-bleeding edge use regular [MELPA](http://melpa.org/#/drupal-mode)).
-
-ELPA (package.el) is part of Emacs 24. For Emacs 23 see
-[Marmalade](http://marmalade-repo.org) for installation instructions.
+the ELPA archive [MELPA
+Stable](https://stable.melpa.org/#/drupal-mode) (if you want bleeding
+edge use regular [MELPA](https://melpa.org/#/drupal-mode)).
 
 
 ## Features of Drupal mode
@@ -46,7 +42,7 @@ ELPA (package.el) is part of Emacs 24. For Emacs 23 see
 ### Drupal Coding Standards
 
 Drupal mode will make you write code that adheres to
-[Drupals coding standards](http://drupal.org/coding-standards#indenting).
+[Drupals coding standards](https://www.drupal.org/coding-standards).
 
 It does this by:
 
@@ -54,7 +50,7 @@ It does this by:
 #### Indentation
 
 In php-mode code will be indented according to
-[Drupals coding standards](http://drupal.org/coding-standards#indenting). If 
not
+[Drupals coding standards](https://drupal.org/coding-standards). If not
 it is considered a bug!
 
 
@@ -91,10 +87,10 @@ menu entry.
 
 Files that are part of a Drupal project will try to identify the used
 version of Drupal core and look up the documentation for the
-corresponding version at http://api.drupal.org.
+corresponding version at https://api.drupal.org.
 
 If the symbol at point is believed to be a Drush command the
-documentation will be looked up at http://api.drush.org instead. If
+documentation will be looked up at https://api.drush.org instead. If
 Drush is installed it will identify the version of Drush and look up
 the documentation for the installed version of Drush.
 
@@ -131,7 +127,7 @@ Etags is a built-in part of Emacs.
 
 ### GNU Globals / gtags
 
-If you load [GNU Globals / gtags](http://www.gnu.org/software/global/)
+If you load [GNU Globals / gtags](https://www.gnu.org/software/global/)
 support in Emacs then Drupal mode will set `gtags-rootdir` to your
 DRUPAL_ROOT.
 
@@ -139,7 +135,7 @@ DRUPAL_ROOT.
 ### Drush utilities for Emacs users
 
 If
-[Drush utilities for Emacs users](http://drupal.org/project/emacs_drush)
+[Drush utilities for Emacs users](https://www.drupal.org/project/emacs_drush)
 is installed Drupal mode will update existing tag files in your
 DRUPAL_ROOT after saving a buffer.
 
@@ -148,11 +144,11 @@ DRUPAL_ROOT after saving a buffer.
 
 If ispell.el is loaded in Emacs then Drupal mode will set the language
 of your Drupal mode buffers to `american` as stated in [Drupals coding
-standards](http://drupal.org/coding-standards).
+standards](https://www.drupal.org/coding-standards).
 
 ispell.el is a built-in part of Emacs. An external program must be
 installed to run the actual spell checking,
-i.e. [ispell](http://www.gnu.org/software/ispell/),
+i.e. [ispell](https://www.gnu.org/software/ispell/),
 [aspell](http://aspell.net/), or
 [hunspell](http://hunspell.sourceforge.net/).
 
@@ -162,14 +158,14 @@ i.e. [ispell](http://www.gnu.org/software/ispell/),
 If support for
 [flymake-phpcs.el](https://github.com/illusori/emacs-flymake-phpcs) is
 loaded in Emacs and you have installed
-[Drupal Code Sniffer](http://drupal.org/project/drupalcs) rules then
+[Drupal Code Sniffer](https://www.drupal.org/project/drupalcs) rules then
 Drupal mode will enable flymake-phpcs under php-mode.
 
 For this to work you need:
 
-*    [PHP CodeSniffer](http://pear.php.net/package/PHP_CodeSniffer)
-*    [flymake-phpcs.el](http://marmalade-repo.org/packages/flymake-phpcs)
-*    [Drupal Code Sniffer](http://drupal.org/project/drupalcs) rules
+*    [PHP CodeSniffer](https://pear.php.net/package/PHP_CodeSniffer)
+*    [flymake-phpcs.el](https://melpa.org/#/flymake-phpcs)
+*    [Drupal Code Sniffer](https://drupal.org/project/drupalcs) rules
 
 
 ## Other takes on a Drupal mode
@@ -179,11 +175,11 @@ wild:
 
 *    [Search Github for 
drupal-mode](https://github.com/search?l=Emacs+Lisp&q=drupal&type=Repositories)
 *     At drupal.org:
-       * http://drupal.org/sandbox/bartlantz/1405156
-       * http://drupal.org/project/emacs
+       * https://www.drupal.org/sandbox/bartlantz/1405156
+       * https://www.drupal.org/project/emacs
 
 All of them more or less based on
-[Configuring Emacs](http://drupal.org/node/59868).
+[Configuring Emacs](https://www.drupal.org/node/59868).
 
 
 ## Development of Drupal mode
diff --git a/drush-make-mode.el b/drush-make-mode.el
index 0d7c3bbefb..5bbe9a8d3e 100644
--- a/drush-make-mode.el
+++ b/drush-make-mode.el
@@ -1,6 +1,6 @@
 ;;; drush-make-mode.el --- Major mode for drush make files
 
-;; Copyright (C) 2013, 2014  Arne Jørgensen
+;; Copyright (C) 2013, 2014, 2020  Arne Jørgensen
 
 ;; Author: Arne Jørgensen <arne@arnested.dk>
 ;; Keywords: languages, tools, extensions
@@ -35,7 +35,7 @@
   :group 'drupal
 
   ;; Use `bug-reference-mode' for linking issues and patches.
-  (set (make-local-variable 'bug-reference-url-format) 
"http://drupal.org/node/%s";)
+  (set (make-local-variable 'bug-reference-url-format) 
"https://www.drupal.org/node/%s";)
   (set (make-local-variable 'bug-reference-bug-regexp) 
"\\(?:\\#\\(?2:[0-9]+\\)\\|\\[['\"]?\\(?2:[0-9]+\\)\\([^0-9].*\\)?\\(['\"]?\\]\\)\\)")
   (bug-reference-mode)