From bcf59b99f43be4f40be1ff85d0281d660a8dd731 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 16 Sep 2021 15:33:35 +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). * doc/emacs/emacs.texi (Top): * doc/emacs/package.texi (Package Menu): * doc/lispintro/emacs-lisp-intro.texi (Top): * doc/lispref/elisp.texi (Top): * doc/lispref/tips.texi (Documentation Tips): * doc/misc/ede.texi (ede-project): * doc/misc/efaq-w32.texi (More information): * doc/misc/gnus-faq.texi (FAQ 5-7): * doc/misc/gnus.texi (About mairix): * doc/misc/mairix-el.texi (About): * doc/misc/reftex.texi (AUCTeX, Imprint): * lisp/cedet/ede/base.el (ede-project): * lisp/cedet/ede/system.el (ede-web-browse-home): * lisp/emacs-lisp/package.el (package-menu-mode-menu) (package-browse-url): * lisp/erc/erc-button.el (erc-emacswiki-url): * lisp/filesets.el (filesets-goto-homepage): * lisp/net/mairix.el: * lisp/net/webjump.el (webjump-sample-sites): * lisp/obsolete/vc-arch.el: * lisp/progmodes/idlw-shell.el (idlwave-shell-mode): * lisp/progmodes/idlwave.el (idlwave, idlwave-mode): * lisp/textmodes/reftex-vars.el (reftex): Prefer "website" to "home page". * doc/lispref/tips.texi (Documentation Tips): Sort the "URL" header comment before "Homepage". * lisp/emacs-lisp/lisp-mnt.el (lm-website): Rename from 'lm-homepage'. (lm-homepage): Make into alias for 'lm-website'. --- doc/emacs/emacs.texi | 2 +- doc/emacs/package.texi | 2 +- doc/lispintro/emacs-lisp-intro.texi | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/tips.texi | 8 ++++---- doc/misc/ede.texi | 2 +- doc/misc/efaq-w32.texi | 2 +- doc/misc/gnus-faq.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/mairix-el.texi | 2 +- doc/misc/reftex.texi | 4 ++-- lisp/cedet/ede/base.el | 4 ++-- lisp/cedet/ede/system.el | 2 +- lisp/emacs-lisp/lisp-mnt.el | 7 ++++--- lisp/emacs-lisp/package.el | 8 ++++---- lisp/erc/erc-button.el | 2 +- lisp/filesets.el | 2 +- lisp/net/mairix.el | 2 +- lisp/net/webjump.el | 4 ++-- lisp/obsolete/vc-arch.el | 2 +- lisp/progmodes/idlw-shell.el | 4 ++-- lisp/progmodes/idlwave.el | 4 ++-- lisp/textmodes/reftex-vars.el | 2 +- 23 files changed, 37 insertions(+), 36 deletions(-) diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index d2011ebf974..2fafb43e9fb 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -116,7 +116,7 @@ ways to customize it; it corresponds to GNU Emacs version @value{EMACSVER}. @c See 'manual-html-mono' and 'manual-html-node' in admin/admin.el. @ifset WWW_GNU_ORG @html -The homepage for GNU Emacs is at +The GNU Emacs website is at https://www.gnu.org/software/emacs/.
To view this manual in other formats, click here.
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index d419a4e24b5..570afd5be2b 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -129,7 +129,7 @@ entails. @item w @kindex w @r{(Package Menu)} @findex package-browse-url -Open the home page of the package on the current line in a browser +Open the package website on the current line in a browser (@code{package-browse-url}). @code{browse-url} is used to open the browser. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 7933ebe58c2..7c7005b3483 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -238,7 +238,7 @@ supports it in developing GNU and promoting software freedom.'' @ifset WWW_GNU_ORG @html -

The homepage for GNU Emacs is at +

The GNU Emacs website is at https://www.gnu.org/software/emacs/.
To view this manual in other formats, click here. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 55bcf399d81..e9e306fa0de 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -161,7 +161,7 @@ Cover art by Etienne Suvasa. @ifset WWW_GNU_ORG @html -

The homepage for GNU Emacs is at +

The GNU Emacs website is at https://www.gnu.org/software/emacs/.
For information on using Emacs, refer to the Emacs Manual.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 1611b983ea2..a72ab88cef6 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -767,7 +767,7 @@ Finally, to create a hyperlink to URLs, write the single-quoted URL, preceded by @samp{URL}. For example, @smallexample -The home page for the GNU project has more information (see URL +The GNU project wesite has more information (see URL `https://www.gnu.org/'). @end smallexample @@ -1100,9 +1100,9 @@ The name of this field is unfortunate, since people often assume it is the place to write arbitrary keywords that describe their package, rather than just the relevant Finder keywords. -@item Homepage -@itemx URL -These lines state the homepage of the library. +@item URL +@itemx Homepage +These lines state the website of the library. @item Package-Version If @samp{Version} is not suitable for use by the package manager, then diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index a0f316f8480..5e9c3d7eef6 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -1556,7 +1556,7 @@ You can also use TRAMP for use with rcp & scp. @item :web-site-file @* -A file which contains the home page for this project. +A file which contains the website for this project. This file can be relative to slot @code{web-site-directory}. This can be a local file, use ange-ftp, EFS, or TRAMP. diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index 6eff88b76e3..ba1077d0acd 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi @@ -2278,7 +2278,7 @@ In Emacs, you can browse the manual using Info by typing @kbd{C-h r}, and you can view the FAQ by typing @kbd{C-h C-f}. Other resources include: @itemize -@item @uref{https://www.gnu.org/software/emacs/, The Emacs homepage} +@item @uref{https://www.gnu.org/software/emacs/, The Emacs website} @item @uref{https://www.gnu.org/software/emacs/manual/, Other Emacs manuals} @item @uref{https://www.emacswiki.org/, Emacs Wiki} @end itemize diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index eac5f0861ff..36c402ab35a 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1443,7 +1443,7 @@ details. However, what you really want is the Insidious Big Brother Database bbdb. Get it from -@uref{http://bbdb.sourceforge.net/, bbdb's homepage}. +@uref{http://bbdb.sourceforge.net/, bbdb's website}. Now place the following in @file{~/.gnus.el}, to activate bbdb for Gnus: @example diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 4559ae8e31e..5eeffbdecaa 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -21898,7 +21898,7 @@ bound to mairix searches and are automatically updated. Mairix is a tool for indexing and searching words in locally stored mail. It was written by Richard Curnow and is licensed under the GPL@. Mairix comes with most popular GNU/Linux distributions, but it also -runs under Windows (with cygwin), macOS and Solaris. The homepage can +runs under Windows (with cygwin), macOS and Solaris. The website can be found at @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html} diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index a571c744870..d0ec552145e 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -68,7 +68,7 @@ database. Mairix is a tool for indexing and searching words in locally stored mail. It was written by Richard Curnow and is licensed under the GPL@. Mairix comes with most popular GNU/Linux distributions, but it also -runs under Windows (with cygwin), macOS and Solaris. The homepage can +runs under Windows (with cygwin), macOS and Solaris. The website can be found at @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html} diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 88ca4450d59..8ca5fcca5ba 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -3192,7 +3192,7 @@ with the @kbd{g} key. To get this behavior, use instead @AUCTeX{} is without doubt the best major mode for editing @TeX{} and @LaTeX{} files with Emacs (@pxref{Top,AUCTeX,,auctex, The AUCTeX User Manual}). -You can get it from its home page at @value{AUCTEXSITE}, but since +You can get it from its website at @value{AUCTEXSITE}, but since it is available from GNU ELPA, you can simply install it from @kbd{M-x list-packages}. @@ -3565,7 +3565,7 @@ With @i{Viper} mode prior to Vipers version 3.01, you need to protect @cindex Acknowledgments @cindex Thanks @cindex Bug reports -@cindex @code{http}, @RefTeX{} home page +@cindex @code{http}, @RefTeX{} website @cindex @code{ftp}, @RefTeX{} site @c dominik@@science.uva.nl diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index 103a37045cc..004da6b95de 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -212,7 +212,7 @@ You can also use TRAMP for use with rcp & scp.") :label "Web Page File" :group name :documentation - "A file which contains the home page for this project. + "A file which contains the website for this project. This file can be relative to slot `web-site-directory'. This can be a local file, use ange-ftp, EFS, or TRAMP.") (ftp-site :initarg :ftp-site @@ -267,7 +267,7 @@ and target specific elements such as build variables.") '( [ "Update Version" ede-update-version ede-object ] [ "Version Control Status" ede-vc-project-directory ede-object ] - [ "Edit Project Homepage" ede-edit-web-page + [ "Edit Project Website" ede-edit-web-page (and ede-object (oref (ede-toplevel) web-site-file)) ] [ "Browse Project URL" ede-web-browse-home (and ede-object diff --git a/lisp/cedet/ede/system.el b/lisp/cedet/ede/system.el index 8ef38f0d33e..1300ba9011e 100644 --- a/lisp/cedet/ede/system.el +++ b/lisp/cedet/ede/system.el @@ -34,7 +34,7 @@ ;;;###autoload (defun ede-web-browse-home () - "Browse the home page of the current project." + "Browse the website of the current project." (interactive) (if (not (ede-toplevel)) (error "No project")) diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index df14a5cd499..b27c7e78a88 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -498,13 +498,14 @@ absent, return nil." "" (buffer-substring-no-properties start (lm-commentary-end)))))))) -(defun lm-homepage (&optional file) - "Return the homepage in file FILE, or current buffer if FILE is nil." +(defun lm-website (&optional file) + "Return the website in file FILE, or current buffer if FILE is nil." (let ((page (lm-with-file file - (lm-header "\\(?:x-\\)?\\(?:homepage\\|url\\)")))) + (lm-header "\\(?:x-\\)?\\(?:url\\|homepage\\)")))) (if (and page (string-match "^<.+>$" page)) (substring page 1 -1) page))) +(defalias 'lm-homepage 'lm-website) ; for backwards-compatibility ;;; Verification and synopses diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c6cb8f058bc..7418b580e80 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2807,8 +2807,8 @@ either a full name or nil, and EMAIL is a valid email address." "Menu for `package-menu-mode'." '("Package" ["Describe Package" package-menu-describe-package :help "Display information about this package"] - ["Open Package Homepage" package-browse-url - :help "Open the homepage of this package"] + ["Open Package Website" package-browse-url + :help "Open the website of this package"] ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"] "--" ["Refresh Package List" revert-buffer @@ -4230,7 +4230,7 @@ beginning of the line." (package-desc-summary package-desc)))) (defun package-browse-url (desc &optional secondary) - "Open the home page of the package under point in a browser. + "Open the website of the package under point in a browser. `browse-url' is used to determine the browser to be used. If SECONDARY (interactively, the prefix), use the secondary browser." (interactive (list (tabulated-list-get-id) @@ -4240,7 +4240,7 @@ If SECONDARY (interactively, the prefix), use the secondary browser." (user-error "No package here")) (let ((url (cdr (assoc :url (package-desc-extras desc))))) (unless url - (user-error "No home page for %s" (package-desc-name desc))) + (user-error "No website for %s" (package-desc-name desc))) (if secondary (funcall browse-url-secondary-browser-function url) (browse-url url)))) diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 5953471ae8e..fc72f324eb9 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -195,7 +195,7 @@ PAR is a number of a regexp grouping whose text will be passed to (integer :tag "Regexp section number"))))) (defcustom erc-emacswiki-url "https://www.emacswiki.org/cgi-bin/wiki.pl?" - "URL of the EmacsWiki Homepage." + "URL of the EmacsWiki website." :type 'string) (defcustom erc-emacswiki-lisp-url "https://www.emacswiki.org/elisp/" diff --git a/lisp/filesets.el b/lisp/filesets.el index 8e9fae80f69..d138675066c 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1848,7 +1848,7 @@ User will be queried, if no fileset name is provided." (filesets-goto-homepage))) (defun filesets-goto-homepage () - "Show filesets's homepage." + "Show filesets's website." (interactive) (browse-url filesets-homepage)) diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index 727aa55de58..3feb089ad05 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el @@ -24,7 +24,7 @@ ;; This is an interface to the mairix mail search engine. Mairix is ;; written by Richard Curnow and is licensed under the GPL. See the -;; home page for details: +;; Mairix website for details: ;; ;; http://www.rpcurnow.force9.co.uk/mairix/ ;; diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 4baa657c0a5..d14d382aac3 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -79,10 +79,10 @@ ;; GNU FTP Mirror List from https://www.gnu.org/order/ftp.html [mirrors "https://ftp.gnu.org/pub/gnu/" "https://ftpmirror.gnu.org"]) - ("GNU Project Home Page" . "www.gnu.org") + ("GNU Project Website" . "www.gnu.org") ;; Emacs. - ("Emacs Home Page" . + ("Emacs Website" . "www.gnu.org/software/emacs/emacs.html") ("Savannah Emacs page" . "savannah.gnu.org/projects/emacs") diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el index cfbf981d3c8..fbbd2d4ecfe 100644 --- a/lisp/obsolete/vc-arch.el +++ b/lisp/obsolete/vc-arch.el @@ -24,7 +24,7 @@ ;;; Commentary: -;; The home page of the Arch version control system is at +;; The Arch version control system website is at ;; ;; https://www.gnu.org/software/gnu-arch/ ;; diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index eb88f25dfd6..f2bfbf3e379 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -878,8 +878,8 @@ IDL has currently stepped.") ------------------------------- Info documentation for this package is available. Use \\[idlwave-info] to display (complain to your sysadmin if that does not work). - For PostScript and HTML versions of the documentation, check IDLWAVE's - homepage at URL `https://github.com/jdtsmith/idlwave'. + For PostScript and HTML versions of the documentation, see IDLWAVE's + website at URL `https://github.com/jdtsmith/idlwave'. IDLWAVE has customize support - see the group `idlwave'. 8. Keybindings diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 55e712dd77d..91be4016232 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -163,7 +163,7 @@ (defgroup idlwave nil "Major mode for editing IDL .pro files." :tag "IDLWAVE" - :link '(url-link :tag "Home Page" + :link '(url-link :tag "Website" "https://github.com/jdtsmith/idlwave") :link '(emacs-commentary-link :tag "Commentary in idlw-shell.el" "idlw-shell.el") @@ -1821,7 +1821,7 @@ The main features of this mode are Info documentation for this package is available. Use \\[idlwave-info] to display (complain to your sysadmin if that does not work). For Postscript, PDF, and HTML versions of the - documentation, check IDLWAVE's homepage at URL + documentation, check IDLWAVE's website at URL `https://github.com/jdtsmith/idlwave'. IDLWAVE has customize support - see the group `idlwave'. diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index cfdf256f70a..19b40e6ce2f 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -263,7 +263,7 @@ distribution. Mixed-case symbols are convenience aliases.") (defgroup reftex nil "LaTeX label and citation support." :tag "RefTeX" - :link '(url-link :tag "Home Page" + :link '(url-link :tag "Website" "https://www.gnu.org/software/auctex/reftex.html") :link '(emacs-commentary-link :tag "Commentary in reftex.el" "reftex.el") :link '(custom-manual "(reftex)Top") -- 2.39.5