* [PATCH] Prefer "website" to "homepage"
@ 2022-06-18 8:38 Stefan Kangas
2022-06-18 10:46 ` Ihor Radchenko
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Kangas @ 2022-06-18 8:38 UTC (permalink / raw)
To: Org-mode
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
These days, a "home page" is understood to be only "the main web page
of a website" or "landing page", whereas a "website" is "a collection
of web pages and related content" (Wikipedia). Emacs was recently
updated to list the "URL" header comment before "Homepage".
Please see the attached patch.
[-- Attachment #2: 0001-Prefer-website-to-homepage.patch --]
[-- Type: text/x-patch, Size: 39107 bytes --]
From 56ffe1256c4bdcc48d465c536c5bedcdb94d341e Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 26 Sep 2021 09:44:29 +0200
Subject: [PATCH] Prefer "website" to "homepage"
These days, a "home page" is understood to be only "the main web page
of a website" or "landing page", whereas a "website" is "a collection
of web pages and related content" (Wikipedia). Emacs was recently
updated to list the "URL" header comment before "Homepage".
* README:
* README_ELPA:
* doc/org-guide.org (Creating Footnotes):
* doc/org-manual.org (Creating Footnotes):
* etc/styles/README (URL): Prefer "website" to "homepage".
* lisp/*.el:
* mk/org-fixup.el: Replace the "Homepage" header comment with "URL".
---
README_ELPA | 2 +-
doc/org-guide.org | 2 +-
doc/org-manual.org | 4 ++--
etc/styles/README | 2 +-
lisp/ob-C.el | 2 +-
lisp/ob-R.el | 2 +-
lisp/ob-awk.el | 2 +-
lisp/ob-calc.el | 2 +-
lisp/ob-clojure.el | 2 +-
lisp/ob-comint.el | 2 +-
lisp/ob-core.el | 2 +-
lisp/ob-css.el | 2 +-
lisp/ob-ditaa.el | 2 +-
lisp/ob-dot.el | 2 +-
lisp/ob-emacs-lisp.el | 2 +-
lisp/ob-eshell.el | 2 +-
lisp/ob-eval.el | 2 +-
lisp/ob-exp.el | 2 +-
lisp/ob-forth.el | 2 +-
lisp/ob-fortran.el | 2 +-
lisp/ob-gnuplot.el | 2 +-
lisp/ob-groovy.el | 2 +-
lisp/ob-haskell.el | 2 +-
lisp/ob-java.el | 2 +-
lisp/ob-js.el | 2 +-
lisp/ob-julia.el | 2 +-
lisp/ob-latex.el | 2 +-
lisp/ob-lilypond.el | 2 +-
lisp/ob-lisp.el | 2 +-
lisp/ob-lob.el | 2 +-
lisp/ob-lua.el | 2 +-
lisp/ob-makefile.el | 2 +-
lisp/ob-matlab.el | 2 +-
lisp/ob-maxima.el | 2 +-
lisp/ob-ocaml.el | 2 +-
lisp/ob-octave.el | 2 +-
lisp/ob-org.el | 2 +-
lisp/ob-perl.el | 2 +-
lisp/ob-plantuml.el | 2 +-
lisp/ob-processing.el | 2 +-
lisp/ob-python.el | 2 +-
lisp/ob-ref.el | 2 +-
lisp/ob-ruby.el | 2 +-
lisp/ob-sass.el | 2 +-
lisp/ob-scheme.el | 2 +-
lisp/ob-screen.el | 2 +-
lisp/ob-shell.el | 2 +-
lisp/ob-sql.el | 2 +-
lisp/ob-sqlite.el | 2 +-
lisp/ob-table.el | 2 +-
lisp/ob-tangle.el | 2 +-
lisp/ob.el | 2 +-
lisp/ol-bbdb.el | 2 +-
lisp/ol-docview.el | 2 +-
lisp/ol-eww.el | 2 +-
lisp/ol-gnus.el | 2 +-
lisp/ol-info.el | 2 +-
lisp/ol-man.el | 2 +-
lisp/ol-mhe.el | 2 +-
lisp/ol-rmail.el | 2 +-
lisp/ol-w3m.el | 2 +-
lisp/org-agenda.el | 2 +-
lisp/org-archive.el | 2 +-
lisp/org-capture.el | 2 +-
lisp/org-clock.el | 2 +-
lisp/org-colview.el | 2 +-
lisp/org-compat.el | 2 +-
lisp/org-cycle.el | 2 +-
lisp/org-datetree.el | 2 +-
lisp/org-element.el | 2 +-
lisp/org-entities.el | 2 +-
lisp/org-faces.el | 2 +-
lisp/org-feed.el | 2 +-
lisp/org-fold-core.el | 2 +-
lisp/org-fold.el | 2 +-
| 2 +-
lisp/org-habit.el | 2 +-
lisp/org-id.el | 2 +-
lisp/org-indent.el | 2 +-
lisp/org-inlinetask.el | 2 +-
lisp/org-list.el | 2 +-
lisp/org-macs.el | 2 +-
lisp/org-mobile.el | 2 +-
lisp/org-pcomplete.el | 2 +-
lisp/org-plot.el | 2 +-
lisp/org-src.el | 2 +-
lisp/org-table.el | 2 +-
lisp/org-tempo.el | 2 +-
lisp/org-timer.el | 2 +-
lisp/org.el | 10 +++++-----
lisp/ox-icalendar.el | 2 +-
lisp/ox-odt.el | 2 +-
mk/org-fixup.el | 2 +-
93 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/README_ELPA b/README_ELPA
index c1ff5e282..c916fbe75 100644
--- a/README_ELPA
+++ b/README_ELPA
@@ -1,6 +1,6 @@
This is the Emacs Org project, an Emacs library for organizing your life.
-The homepage of Org is at:
+The Org website is at:
https://orgmode.org
Installations instructions are at:
diff --git a/doc/org-guide.org b/doc/org-guide.org
index 4d53e4bfb..e23b2efa7 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -2066,7 +2066,7 @@ footnote reference is simply the marker in square brackets, inside
text. For example:
#+begin_example
-The Org homepage[fn:1] now looks a lot better than it used to.
+The Org website[fn:1] now looks a lot better than it used to.
...
[fn:1] The link is: https://orgmode.org
#+end_example
diff --git a/doc/org-manual.org b/doc/org-manual.org
index cb2405ec7..07f151837 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11346,7 +11346,7 @@ footnote reference is simply the marker in square brackets, inside
text. Markers always start with =fn:=. For example:
#+begin_example
-The Org homepage[fn:1] now looks a lot better than it used to.
+The Org website[fn:1] now looks a lot better than it used to.
...
[fn:1] The link is: https://orgmode.org
#+end_example
@@ -12907,7 +12907,7 @@ changing the link's title and style:
#+cindex: @samp{ATTR_HTML}, keyword
#+begin_example
-,#+ATTR_HTML: :title The Org mode homepage :style color:red;
+,#+ATTR_HTML: :title The Org mode website :style color:red;
[[https://orgmode.org]]
#+end_example
diff --git a/etc/styles/README b/etc/styles/README
index aac788d3c..af15f95ab 100644
--- a/etc/styles/README
+++ b/etc/styles/README
@@ -21,7 +21,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
Author: Jambunathan K <kjambunathan at gmail dot com>
Keywords: outlines, hypermedia, calendar, wp
-Homepage: https://orgmode.org
+URL: https://orgmode.org
Commentary:
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 4f71a8879..175f4b81d 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -6,7 +6,7 @@
;; Thierry Banel
;; Maintainer: Thierry Banel <tbanelwebmin@free.fr>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index f573723c2..b04104de5 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Jeremie Juste <jeremiejuste@gmail.com>
;; Keywords: literate programming, reproducible research, R, statistics
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 1d5a6f24e..c4916cc65 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Tyler Smith <tyler@plantarum.ca>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 9cf16a04c..aced6cfd6 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Tom Gillespie <tgbugs@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 5a44b6487..87e234ce2 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;;
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 427aba341..efca03eeb 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index fc5cbebb1..3d1a87849 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index 51efbb7d9..e1a02ee9f 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 20b5ce1fd..97501c446 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index b2fc5d356..6bab3a0fe 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Justin Abrahms <justin@abrah.ms>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index 730eff69e..aca088404 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el
index 135deb4a4..2bc1fe236 100644
--- a/lisp/ob-eshell.el
+++ b/lisp/ob-eshell.el
@@ -4,7 +4,7 @@
;; Author: stardiviner <numbchild@gmail.com>
;; Maintainer: stardiviner <numbchild@gmail.com>
-;; Homepage: https://github.com/stardiviner/ob-eshell
+;; URL: https://github.com/stardiviner/ob-eshell
;; Keywords: literate programming, reproducible research
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index be1ba5491..aa5b64509 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 7b250f6bb..40d0278a5 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index 53088b070..a68b358b6 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, forth
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 9c49aa887..8d88ad34c 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -5,7 +5,7 @@
;; Authors: Sergey Litvinov
;; Eric Schulte
;; Keywords: literate programming, reproducible research, fortran
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 83d0a011c..311338479 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Ihor Radchenko <yantar92@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index c97a7d835..ffaa81cc0 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -5,7 +5,7 @@
;; Author: Miro Bezjak <bezjak.miro@gmail.com>
;; Maintainer: Palak Mathur <palakmathur@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index 45f70fa87..ccd3f078a 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Lawrence Bottorff <borgauf@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index 0f6faf446..824635ecf 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Ian Martins <ianxm@jhu.edu>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 4bb379b0b..4fbe543cd 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, js
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index be0110f48..cb65b0310 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -4,7 +4,7 @@
;; Authors: G. Jay Kerns
;; Maintainer: Pedro Bruel <pedro.bruel@gmail.com>
;; Keywords: literate programming, reproducible research, scientific computing
-;; Homepage: https://github.com/phrb/ob-julia
+;; URL: https://github.com/phrb/ob-julia
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index eaa9a9217..54816bdc5 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index dc33ebc17..50e1a7673 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -4,7 +4,7 @@
;; Author: Martyn Jago
;; Keywords: babel language, literate programming
-;; Homepage: https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
+;; URL: https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index f9d5fed0c..239fa5218 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -6,7 +6,7 @@
;; Eric Schulte
;; David T. O'Toole <dto@gnu.org>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 5aae3f591..88d47c169 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index c8c28498e..b7fb2a8b8 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -4,7 +4,7 @@
;; Authors: Dieter Schoen
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 142e760ea..aef55bcad 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Thomas S. Dye
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index 4ee090e4a..19c17b646 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 6bc3427ea..d5bd4d924 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -5,7 +5,7 @@
;; Author: Eric S Fraga
;; Eric Schulte
;; Keywords: literate programming, reproducible research, maxima
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 80df79581..b26e63923 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index bbbda5bb1..b3a74ab4a 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 965b0984e..5765c57e7 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index b558fbb25..cbac5343f 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -6,7 +6,7 @@
;; Eric Schulte
;; Maintainer: Corwin Brust <corwin@bru.st>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 6e1b1b171..ebbcdf166 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -4,7 +4,7 @@
;; Author: Zhang Weize
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index f961a9907..c97be78ea 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -4,7 +4,7 @@
;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 3e9049e73..932aca08e 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Jack Kamm <jackkamm@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 1a77e39b1..d5356f18c 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index d35b55ca5..9543f3bba 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index c0f63a9b6..5c947fee1 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index b91c368a7..a2c71b217 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Michael Gauland
;; Keywords: literate programming, reproducible research, scheme
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index 8d526b117..b7245cfb9 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -5,7 +5,7 @@
;; Author: Benjamin Andresen
;; Maintainer: Ken Mankoff <mankoff@gmail.com>
;; Keywords: literate programming, interactive shell
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 4454e3b5d..1cd7d127e 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 5f7c0de00..e4cf28ced 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 6bcde942c..006b27eca 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Nick Savage <nick@nicksavage.ca>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 0f6d41c5e..bafc81a1a 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 6685a1599..f4fb2af71 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob.el b/lisp/ob.el
index 785eccf96..44828c724 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -4,7 +4,7 @@
;; Authors: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ol-bbdb.el b/lisp/ol-bbdb.el
index ffca43848..d756c7948 100644
--- a/lisp/ol-bbdb.el
+++ b/lisp/ol-bbdb.el
@@ -5,7 +5,7 @@
;; Authors: Carsten Dominik <carsten.dominik@gmail.com>
;; Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-docview.el b/lisp/ol-docview.el
index 6ea224c76..a5f74ce90 100644
--- a/lisp/ol-docview.el
+++ b/lisp/ol-docview.el
@@ -4,7 +4,7 @@
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-eww.el b/lisp/ol-eww.el
index 722e2c716..7811be2c1 100644
--- a/lisp/ol-eww.el
+++ b/lisp/ol-eww.el
@@ -4,7 +4,7 @@
;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
;; Keywords: link, eww
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ol-gnus.el b/lisp/ol-gnus.el
index 3a3857fbf..a1dbc3bb8 100644
--- a/lisp/ol-gnus.el
+++ b/lisp/ol-gnus.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Tassilo Horn <tassilo at member dot fsf dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-info.el b/lisp/ol-info.el
index 3730ff5ad..dc5f6d5ba 100644
--- a/lisp/ol-info.el
+++ b/lisp/ol-info.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-man.el b/lisp/ol-man.el
index 3806d95cd..aa22964c5 100644
--- a/lisp/ol-man.el
+++ b/lisp/ol-man.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-mhe.el b/lisp/ol-mhe.el
index 49104d392..e112e1b79 100644
--- a/lisp/ol-mhe.el
+++ b/lisp/ol-mhe.el
@@ -4,7 +4,7 @@
;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-rmail.el b/lisp/ol-rmail.el
index 8a28d720b..186eeb86f 100644
--- a/lisp/ol-rmail.el
+++ b/lisp/ol-rmail.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-w3m.el b/lisp/ol-w3m.el
index 80d6811a5..ea2982900 100644
--- a/lisp/ol-w3m.el
+++ b/lisp/ol-w3m.el
@@ -4,7 +4,7 @@
;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2a8c10d48..2796ad36d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 1026a295e..196384c6e 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 948eb8bc6..9ef160d16 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index fbbda3b47..7d99e5087 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index ca64b11aa..c78868a74 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 704197645..baad39459 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index b15ead788..b21f8f63d 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -4,7 +4,7 @@
;;
;; Maintainer: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, visibility cycling, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 30f5f99ae..737799407 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 61dbe4f14..4bba6e680 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3482,7 +3482,7 @@ Assume point is at the beginning of the link."
(setq path (match-string-no-properties 1))
(setq contents-begin (match-beginning 1))
(setq contents-end (match-end 1)))
- ;; Type 2: Standard link, i.e. [[https://orgmode.org][homepage]]
+ ;; Type 2: Standard link, i.e. [[https://orgmode.org][website]]
((looking-at org-link-bracket-re)
(setq format 'bracket)
(setq contents-begin (match-beginning 2))
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 9c64cb854..d35e3fa8a 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>,
;; Ulf Stegemann <ulf at zeitform dot de>
;; Keywords: outlines, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 5fb6c3e07..3095dd5a4 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index d634f9c41..118cac887 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 822a8bf96..88072852d 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -4,7 +4,7 @@
;;
;; Author: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 53420cb07..ce8afd9b4 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -4,7 +4,7 @@
;;
;; Author: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
--git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 8e0ac0da2..0e9cb5b75 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index e1a223b12..412bce4a5 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -4,7 +4,7 @@
;; Author: John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 42b165681..13a831590 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 4cca0c35d..08b4aacb2 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 30b10b55b..563b8594f 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 55fb7d18e..e2c3fad7c 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index f364d6176..35493235f 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index dd5333399..d3ef77b00 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -3,7 +3,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 8d995bcd2..775f2f9a8 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index c6bae4b62..3928da7d8 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
;; Maintainer: TEC <tecosaur@gmail.com>
;; Keywords: tables, plotting
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 006217f70..58e5b252a 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -6,7 +6,7 @@
;; Bastien Guerry <bzg@gnu.org>
;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index f91dce109..54e2df20b 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index f9a913ec2..94da94ffd 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -4,7 +4,7 @@
;;
;; Author: Rasmus Pank Roulund <emacs at pank dot eu>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 0c9350e76..0b33b2323 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org.el b/lisp/org.el
index 220210992..64504fe16 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; Package-Requires: ((emacs "25.1"))
;; Version: 9.6-dev
@@ -56,10 +56,10 @@
;; Documentation
;; -------------
;; The documentation of Org mode can be found in the TeXInfo file. The
-;; distribution also contains a PDF version of it. At the homepage of
-;; Org mode, you can read the same text online as HTML. There is also an
-;; excellent reference card made by Philip Rooke. This card can be found
-;; in the doc/ directory.
+;; distribution also contains a PDF version of it. At the Org mode website,
+;; you can read the same text online as HTML. There is also an excellent
+;; reference card made by Philip Rooke. This card can be found in the
+;; doc/ directory.
;;
;; A list of recent changes can be found at
;; https://orgmode.org/Changes.html
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index 6e4688119..7744c77da 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -6,7 +6,7 @@
;; Nicolas Goaziou <mail@nicolasgoaziou.fr>
;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 9d47067f1..5483c4504 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -4,7 +4,7 @@
;; Author: Jambunathan K <kjambunathan at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 0e26cc7e7..86a48d91e 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -2,7 +2,7 @@
;;
;; Author: Achim Gratz
;; Keywords: orgmode
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is not part of GNU Emacs.
;;
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Prefer "website" to "homepage"
2022-06-18 8:38 [PATCH] Prefer "website" to "homepage" Stefan Kangas
@ 2022-06-18 10:46 ` Ihor Radchenko
2022-06-18 12:39 ` Stefan Kangas
0 siblings, 1 reply; 6+ messages in thread
From: Ihor Radchenko @ 2022-06-18 10:46 UTC (permalink / raw)
To: Stefan Kangas; +Cc: Org-mode
Stefan Kangas <stefan@marxist.se> writes:
> These days, a "home page" is understood to be only "the main web page
> of a website" or "landing page", whereas a "website" is "a collection
> of web pages and related content" (Wikipedia).
Thanks for the patch!
> ... Emacs was recently
> updated to list the "URL" header comment before "Homepage".
Could you please point out to the relevant discussion?
Best,
Ihor
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Prefer "website" to "homepage"
2022-06-18 10:46 ` Ihor Radchenko
@ 2022-06-18 12:39 ` Stefan Kangas
2022-06-19 5:44 ` Ihor Radchenko
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Kangas @ 2022-06-18 12:39 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: Org-mode
Ihor Radchenko <yantar92@gmail.com> writes:
> > ... Emacs was recently
> > updated to list the "URL" header comment before "Homepage".
>
> Could you please point out to the relevant discussion?
This was uncontroversial so not really discussed, but see:
https://git.savannah.gnu.org/gitweb/?p=emacs.git;a=commit;h=bcf59b99f43be4f
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Prefer "website" to "homepage"
2022-06-18 12:39 ` Stefan Kangas
@ 2022-06-19 5:44 ` Ihor Radchenko
2022-06-25 18:52 ` Stefan Kangas
0 siblings, 1 reply; 6+ messages in thread
From: Ihor Radchenko @ 2022-06-19 5:44 UTC (permalink / raw)
To: Stefan Kangas; +Cc: Org-mode
Stefan Kangas <stefan@marxist.se> writes:
>> Could you please point out to the relevant discussion?
>
> This was uncontroversial so not really discussed, but see:
>
> https://git.savannah.gnu.org/gitweb/?p=emacs.git;a=commit;h=bcf59b99f43be4f
Thanks! So, Emacs now advises to use "website" and "URL:", right?
Mentioning this fact, and the relevant commit would improve the commit
message. (that is: please update the commit message explaining the
change by changed Emacs recommendations).
Best,
Ihor
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Prefer "website" to "homepage"
2022-06-19 5:44 ` Ihor Radchenko
@ 2022-06-25 18:52 ` Stefan Kangas
2022-06-26 2:13 ` Ihor Radchenko
0 siblings, 1 reply; 6+ messages in thread
From: Stefan Kangas @ 2022-06-25 18:52 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: Org-mode
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
Ihor Radchenko <yantar92@gmail.com> writes:
> Thanks! So, Emacs now advises to use "website" and "URL:", right?
> Mentioning this fact, and the relevant commit would improve the commit
> message. (that is: please update the commit message explaining the
> change by changed Emacs recommendations).
Please see the attached.
[-- Attachment #2: 0001-Prefer-website-to-homepage.patch --]
[-- Type: text/x-patch, Size: 38970 bytes --]
From cdd375813263250fd39be9888b3d0a68d9ba0063 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 26 Sep 2021 09:44:29 +0200
Subject: [PATCH] Prefer "website" to "homepage"
Emacs now advises using "website" (instead of "homepage") and
consequently to use the "URL" comment header instead of "Homepage".
* README:
* README_ELPA:
* doc/org-guide.org (Creating Footnotes):
* doc/org-manual.org (Creating Footnotes):
* etc/styles/README (URL): Prefer "website" to "homepage".
* lisp/*.el:
* mk/org-fixup.el: Replace the "Homepage" header comment with "URL".
---
README_ELPA | 2 +-
doc/org-guide.org | 2 +-
doc/org-manual.org | 4 ++--
etc/styles/README | 2 +-
lisp/ob-C.el | 2 +-
lisp/ob-R.el | 2 +-
lisp/ob-awk.el | 2 +-
lisp/ob-calc.el | 2 +-
lisp/ob-clojure.el | 2 +-
lisp/ob-comint.el | 2 +-
lisp/ob-core.el | 2 +-
lisp/ob-css.el | 2 +-
lisp/ob-ditaa.el | 2 +-
lisp/ob-dot.el | 2 +-
lisp/ob-emacs-lisp.el | 2 +-
lisp/ob-eshell.el | 2 +-
lisp/ob-eval.el | 2 +-
lisp/ob-exp.el | 2 +-
lisp/ob-forth.el | 2 +-
lisp/ob-fortran.el | 2 +-
lisp/ob-gnuplot.el | 2 +-
lisp/ob-groovy.el | 2 +-
lisp/ob-haskell.el | 2 +-
lisp/ob-java.el | 2 +-
lisp/ob-js.el | 2 +-
lisp/ob-julia.el | 2 +-
lisp/ob-latex.el | 2 +-
lisp/ob-lilypond.el | 2 +-
lisp/ob-lisp.el | 2 +-
lisp/ob-lob.el | 2 +-
lisp/ob-lua.el | 2 +-
lisp/ob-makefile.el | 2 +-
lisp/ob-matlab.el | 2 +-
lisp/ob-maxima.el | 2 +-
lisp/ob-ocaml.el | 2 +-
lisp/ob-octave.el | 2 +-
lisp/ob-org.el | 2 +-
lisp/ob-perl.el | 2 +-
lisp/ob-plantuml.el | 2 +-
lisp/ob-processing.el | 2 +-
lisp/ob-python.el | 2 +-
lisp/ob-ref.el | 2 +-
lisp/ob-ruby.el | 2 +-
lisp/ob-sass.el | 2 +-
lisp/ob-scheme.el | 2 +-
lisp/ob-screen.el | 2 +-
lisp/ob-shell.el | 2 +-
lisp/ob-sql.el | 2 +-
lisp/ob-sqlite.el | 2 +-
lisp/ob-table.el | 2 +-
lisp/ob-tangle.el | 2 +-
lisp/ob.el | 2 +-
lisp/ol-bbdb.el | 2 +-
lisp/ol-docview.el | 2 +-
lisp/ol-eww.el | 2 +-
lisp/ol-gnus.el | 2 +-
lisp/ol-info.el | 2 +-
lisp/ol-man.el | 2 +-
lisp/ol-mhe.el | 2 +-
lisp/ol-rmail.el | 2 +-
lisp/ol-w3m.el | 2 +-
lisp/org-agenda.el | 2 +-
lisp/org-archive.el | 2 +-
lisp/org-capture.el | 2 +-
lisp/org-clock.el | 2 +-
lisp/org-colview.el | 2 +-
lisp/org-compat.el | 2 +-
lisp/org-cycle.el | 2 +-
lisp/org-datetree.el | 2 +-
lisp/org-element.el | 2 +-
lisp/org-entities.el | 2 +-
lisp/org-faces.el | 2 +-
lisp/org-feed.el | 2 +-
lisp/org-fold-core.el | 2 +-
lisp/org-fold.el | 2 +-
| 2 +-
lisp/org-habit.el | 2 +-
lisp/org-id.el | 2 +-
lisp/org-indent.el | 2 +-
lisp/org-inlinetask.el | 2 +-
lisp/org-list.el | 2 +-
lisp/org-macs.el | 2 +-
lisp/org-mobile.el | 2 +-
lisp/org-pcomplete.el | 2 +-
lisp/org-plot.el | 2 +-
lisp/org-src.el | 2 +-
lisp/org-table.el | 2 +-
lisp/org-tempo.el | 2 +-
lisp/org-timer.el | 2 +-
lisp/org.el | 10 +++++-----
lisp/ox-icalendar.el | 2 +-
lisp/ox-odt.el | 2 +-
mk/org-fixup.el | 2 +-
93 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/README_ELPA b/README_ELPA
index c1ff5e282..c916fbe75 100644
--- a/README_ELPA
+++ b/README_ELPA
@@ -1,6 +1,6 @@
This is the Emacs Org project, an Emacs library for organizing your life.
-The homepage of Org is at:
+The Org website is at:
https://orgmode.org
Installations instructions are at:
diff --git a/doc/org-guide.org b/doc/org-guide.org
index 4d53e4bfb..e23b2efa7 100644
--- a/doc/org-guide.org
+++ b/doc/org-guide.org
@@ -2066,7 +2066,7 @@ footnote reference is simply the marker in square brackets, inside
text. For example:
#+begin_example
-The Org homepage[fn:1] now looks a lot better than it used to.
+The Org website[fn:1] now looks a lot better than it used to.
...
[fn:1] The link is: https://orgmode.org
#+end_example
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 0bf018077..4c2e968e7 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11346,7 +11346,7 @@ footnote reference is simply the marker in square brackets, inside
text. Markers always start with =fn:=. For example:
#+begin_example
-The Org homepage[fn:1] now looks a lot better than it used to.
+The Org website[fn:1] now looks a lot better than it used to.
...
[fn:1] The link is: https://orgmode.org
#+end_example
@@ -12907,7 +12907,7 @@ changing the link's title and style:
#+cindex: @samp{ATTR_HTML}, keyword
#+begin_example
-,#+ATTR_HTML: :title The Org mode homepage :style color:red;
+,#+ATTR_HTML: :title The Org mode website :style color:red;
[[https://orgmode.org]]
#+end_example
diff --git a/etc/styles/README b/etc/styles/README
index aac788d3c..af15f95ab 100644
--- a/etc/styles/README
+++ b/etc/styles/README
@@ -21,7 +21,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
Author: Jambunathan K <kjambunathan at gmail dot com>
Keywords: outlines, hypermedia, calendar, wp
-Homepage: https://orgmode.org
+URL: https://orgmode.org
Commentary:
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 4f71a8879..175f4b81d 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -6,7 +6,7 @@
;; Thierry Banel
;; Maintainer: Thierry Banel <tbanelwebmin@free.fr>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index f573723c2..b04104de5 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Jeremie Juste <jeremiejuste@gmail.com>
;; Keywords: literate programming, reproducible research, R, statistics
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 1d5a6f24e..c4916cc65 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Tyler Smith <tyler@plantarum.ca>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 9cf16a04c..aced6cfd6 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Tom Gillespie <tgbugs@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 5a44b6487..87e234ce2 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;;
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 427aba341..efca03eeb 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index fc5cbebb1..3d1a87849 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index 51efbb7d9..e1a02ee9f 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 20b5ce1fd..97501c446 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index b2fc5d356..6bab3a0fe 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Justin Abrahms <justin@abrah.ms>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index 730eff69e..aca088404 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-eshell.el b/lisp/ob-eshell.el
index 135deb4a4..2bc1fe236 100644
--- a/lisp/ob-eshell.el
+++ b/lisp/ob-eshell.el
@@ -4,7 +4,7 @@
;; Author: stardiviner <numbchild@gmail.com>
;; Maintainer: stardiviner <numbchild@gmail.com>
-;; Homepage: https://github.com/stardiviner/ob-eshell
+;; URL: https://github.com/stardiviner/ob-eshell
;; Keywords: literate programming, reproducible research
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index be1ba5491..aa5b64509 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 7b250f6bb..40d0278a5 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index 53088b070..a68b358b6 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, forth
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 9c49aa887..8d88ad34c 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -5,7 +5,7 @@
;; Authors: Sergey Litvinov
;; Eric Schulte
;; Keywords: literate programming, reproducible research, fortran
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 83d0a011c..311338479 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Ihor Radchenko <yantar92@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index c97a7d835..ffaa81cc0 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -5,7 +5,7 @@
;; Author: Miro Bezjak <bezjak.miro@gmail.com>
;; Maintainer: Palak Mathur <palakmathur@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index 45f70fa87..ccd3f078a 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Lawrence Bottorff <borgauf@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index 0f6faf446..824635ecf 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Ian Martins <ianxm@jhu.edu>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 4bb379b0b..4fbe543cd 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, js
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index be0110f48..cb65b0310 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -4,7 +4,7 @@
;; Authors: G. Jay Kerns
;; Maintainer: Pedro Bruel <pedro.bruel@gmail.com>
;; Keywords: literate programming, reproducible research, scientific computing
-;; Homepage: https://github.com/phrb/ob-julia
+;; URL: https://github.com/phrb/ob-julia
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index eaa9a9217..54816bdc5 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index dc33ebc17..50e1a7673 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -4,7 +4,7 @@
;; Author: Martyn Jago
;; Keywords: babel language, literate programming
-;; Homepage: https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
+;; URL: https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index f9d5fed0c..239fa5218 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -6,7 +6,7 @@
;; Eric Schulte
;; David T. O'Toole <dto@gnu.org>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 5aae3f591..88d47c169 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index c8c28498e..b7fb2a8b8 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -4,7 +4,7 @@
;; Authors: Dieter Schoen
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 142e760ea..aef55bcad 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Thomas S. Dye
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el
index 4ee090e4a..19c17b646 100644
--- a/lisp/ob-matlab.el
+++ b/lisp/ob-matlab.el
@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 6bc3427ea..d5bd4d924 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -5,7 +5,7 @@
;; Author: Eric S Fraga
;; Eric Schulte
;; Keywords: literate programming, reproducible research, maxima
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 80df79581..b26e63923 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index bbbda5bb1..b3a74ab4a 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 965b0984e..5765c57e7 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index b558fbb25..cbac5343f 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -6,7 +6,7 @@
;; Eric Schulte
;; Maintainer: Corwin Brust <corwin@bru.st>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index 6e1b1b171..ebbcdf166 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -4,7 +4,7 @@
;; Author: Zhang Weize
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el
index f961a9907..c97be78ea 100644
--- a/lisp/ob-processing.el
+++ b/lisp/ob-processing.el
@@ -4,7 +4,7 @@
;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 3e9049e73..932aca08e 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -6,7 +6,7 @@
;; Dan Davison
;; Maintainer: Jack Kamm <jackkamm@gmail.com>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 1a77e39b1..d5356f18c 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index d35b55ca5..9543f3bba 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index c0f63a9b6..5c947fee1 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index b91c368a7..a2c71b217 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Michael Gauland
;; Keywords: literate programming, reproducible research, scheme
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index 8d526b117..b7245cfb9 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -5,7 +5,7 @@
;; Author: Benjamin Andresen
;; Maintainer: Ken Mankoff <mankoff@gmail.com>
;; Keywords: literate programming, interactive shell
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 4454e3b5d..1cd7d127e 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 5f7c0de00..e4cf28ced 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 6bcde942c..006b27eca 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Maintainer: Nick Savage <nick@nicksavage.ca>
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 0f6d41c5e..bafc81a1a 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 6685a1599..f4fb2af71 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ob.el b/lisp/ob.el
index 785eccf96..44828c724 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -4,7 +4,7 @@
;; Authors: Eric Schulte
;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ol-bbdb.el b/lisp/ol-bbdb.el
index ffca43848..d756c7948 100644
--- a/lisp/ol-bbdb.el
+++ b/lisp/ol-bbdb.el
@@ -5,7 +5,7 @@
;; Authors: Carsten Dominik <carsten.dominik@gmail.com>
;; Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-docview.el b/lisp/ol-docview.el
index 6ea224c76..a5f74ce90 100644
--- a/lisp/ol-docview.el
+++ b/lisp/ol-docview.el
@@ -4,7 +4,7 @@
;; Author: Jan Böcker <jan.boecker at jboecker dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-eww.el b/lisp/ol-eww.el
index 722e2c716..7811be2c1 100644
--- a/lisp/ol-eww.el
+++ b/lisp/ol-eww.el
@@ -4,7 +4,7 @@
;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
;; Keywords: link, eww
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ol-gnus.el b/lisp/ol-gnus.el
index 3a3857fbf..a1dbc3bb8 100644
--- a/lisp/ol-gnus.el
+++ b/lisp/ol-gnus.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Tassilo Horn <tassilo at member dot fsf dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-info.el b/lisp/ol-info.el
index 3730ff5ad..dc5f6d5ba 100644
--- a/lisp/ol-info.el
+++ b/lisp/ol-info.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-man.el b/lisp/ol-man.el
index 3806d95cd..aa22964c5 100644
--- a/lisp/ol-man.el
+++ b/lisp/ol-man.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-mhe.el b/lisp/ol-mhe.el
index 49104d392..e112e1b79 100644
--- a/lisp/ol-mhe.el
+++ b/lisp/ol-mhe.el
@@ -4,7 +4,7 @@
;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-rmail.el b/lisp/ol-rmail.el
index 8a28d720b..186eeb86f 100644
--- a/lisp/ol-rmail.el
+++ b/lisp/ol-rmail.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/ol-w3m.el b/lisp/ol-w3m.el
index 80d6811a5..ea2982900 100644
--- a/lisp/ol-w3m.el
+++ b/lisp/ol-w3m.el
@@ -4,7 +4,7 @@
;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 76f71e33e..67d97cd38 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 1026a295e..196384c6e 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 948eb8bc6..9ef160d16 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index fbbda3b47..7d99e5087 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index ca64b11aa..c78868a74 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 704197645..baad39459 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index fb7ff4749..41d878a14 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -4,7 +4,7 @@
;;
;; Maintainer: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, visibility cycling, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 30f5f99ae..737799407 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 61dbe4f14..4bba6e680 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3482,7 +3482,7 @@ Assume point is at the beginning of the link."
(setq path (match-string-no-properties 1))
(setq contents-begin (match-beginning 1))
(setq contents-end (match-end 1)))
- ;; Type 2: Standard link, i.e. [[https://orgmode.org][homepage]]
+ ;; Type 2: Standard link, i.e. [[https://orgmode.org][website]]
((looking-at org-link-bracket-re)
(setq format 'bracket)
(setq contents-begin (match-beginning 2))
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 9c64cb854..d35e3fa8a 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>,
;; Ulf Stegemann <ulf at zeitform dot de>
;; Keywords: outlines, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 5fb6c3e07..3095dd5a4 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index d634f9c41..118cac887 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 822a8bf96..88072852d 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -4,7 +4,7 @@
;;
;; Author: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 53420cb07..ce8afd9b4 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -4,7 +4,7 @@
;;
;; Author: Ihor Radchenko <yantar92 at gmail dot com>
;; Keywords: folding, invisible text
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
--git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 8e0ac0da2..0e9cb5b75 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index e1a223b12..412bce4a5 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -4,7 +4,7 @@
;; Author: John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 42b165681..13a831590 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 4cca0c35d..08b4aacb2 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 30b10b55b..563b8594f 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -4,7 +4,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 55fb7d18e..e2c3fad7c 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index f364d6176..35493235f 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index dd5333399..d3ef77b00 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -3,7 +3,7 @@
;;
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 8d995bcd2..775f2f9a8 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -5,7 +5,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; John Wiegley <johnw at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index c6bae4b62..3928da7d8 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
;; Author: Eric Schulte <schulte dot eric at gmail dot com>
;; Maintainer: TEC <tecosaur@gmail.com>
;; Keywords: tables, plotting
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 006217f70..58e5b252a 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -6,7 +6,7 @@
;; Bastien Guerry <bzg@gnu.org>
;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index f91dce109..54e2df20b 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index f9a913ec2..94da94ffd 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -4,7 +4,7 @@
;;
;; Author: Rasmus Pank Roulund <emacs at pank dot eu>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 0c9350e76..0b33b2323 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -4,7 +4,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org.el b/lisp/org.el
index 60c066b4b..080a7bf99 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
;; Author: Carsten Dominik <carsten.dominik@gmail.com>
;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; Package-Requires: ((emacs "25.1"))
;; Version: 9.6-dev
@@ -56,10 +56,10 @@
;; Documentation
;; -------------
;; The documentation of Org mode can be found in the TeXInfo file. The
-;; distribution also contains a PDF version of it. At the homepage of
-;; Org mode, you can read the same text online as HTML. There is also an
-;; excellent reference card made by Philip Rooke. This card can be found
-;; in the doc/ directory.
+;; distribution also contains a PDF version of it. At the Org mode website,
+;; you can read the same text online as HTML. There is also an excellent
+;; reference card made by Philip Rooke. This card can be found in the
+;; doc/ directory.
;;
;; A list of recent changes can be found at
;; https://orgmode.org/Changes.html
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index 6e4688119..7744c77da 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -6,7 +6,7 @@
;; Nicolas Goaziou <mail@nicolasgoaziou.fr>
;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 9d47067f1..5483c4504 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -4,7 +4,7 @@
;; Author: Jambunathan K <kjambunathan at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;; This file is part of GNU Emacs.
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 0e26cc7e7..86a48d91e 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -2,7 +2,7 @@
;;
;; Author: Achim Gratz
;; Keywords: orgmode
-;; Homepage: https://orgmode.org
+;; URL: https://orgmode.org
;;
;; This file is not part of GNU Emacs.
;;
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Prefer "website" to "homepage"
2022-06-25 18:52 ` Stefan Kangas
@ 2022-06-26 2:13 ` Ihor Radchenko
0 siblings, 0 replies; 6+ messages in thread
From: Ihor Radchenko @ 2022-06-26 2:13 UTC (permalink / raw)
To: Stefan Kangas; +Cc: Org-mode
Stefan Kangas <stefan@marxist.se> writes:
> Ihor Radchenko <yantar92@gmail.com> writes:
>
>> Thanks! So, Emacs now advises to use "website" and "URL:", right?
>> Mentioning this fact, and the relevant commit would improve the commit
>> message. (that is: please update the commit message explaining the
>> change by changed Emacs recommendations).
>
> Please see the attached.
Thanks!
Applied onto main via 13d97ee18.
Best,
Ihor
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-26 2:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-18 8:38 [PATCH] Prefer "website" to "homepage" Stefan Kangas
2022-06-18 10:46 ` Ihor Radchenko
2022-06-18 12:39 ` Stefan Kangas
2022-06-19 5:44 ` Ihor Radchenko
2022-06-25 18:52 ` Stefan Kangas
2022-06-26 2:13 ` Ihor Radchenko
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).