; Prefer finder keyword "text" to deprecated keyword "wp"

114 files changed, 114 insertions, 114 deletions

diff --git a/lisp/allout.el b/lisp/allout.el
index d3203800168..3c3a60fea2f 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5,7 +5,7 @@
 ;; Author: Ken Manheimer <ken dot manheimer at gmail...>
 ;; Created: Dec 1991 -- first release to usenet
 ;; Version: 2.3
-;; Keywords: outlines, wp, languages, PGP, GnuPG
+;; Keywords: outlines, text, languages, PGP, GnuPG
 ;; Website: https://myriadicity.net/software-and-systems/craft/emacs-allout
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index 1fd7abef974..8eb16ed49e9 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index 24eb711eb99..619575bb9a2 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index bc32598003e..38e62a25cc4 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2004, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el
index 2781ea87938..521aa71fa83 100644
--- a/lisp/nxml/nxml-ns.el
+++ b/lisp/nxml/nxml-ns.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 5f1eec75ef9..dbcc25a080b 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index f2440065deb..50bf85a6be6 100644
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index 8e11707b9b7..6b6fc4078c9 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2004, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index e9d04126400..ad175a527e6 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 98aad8bd4dd..e1a6bd92349 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el
index 577157687a3..c088a967cfe 100644
--- a/lisp/nxml/rng-dt.el
+++ b/lisp/nxml/rng-dt.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index 82e8494a49f..79638ce4170 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 42feb221e81..ec0e43edf60 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index 51c197cd6c6..03552fe7b7a 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index fd1f4fb904e..ef8746a6598 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el
index 1728de7aadd..cf233fd9608 100644
--- a/lisp/nxml/rng-parse.el
+++ b/lisp/nxml/rng-parse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el
index f37ace7f734..98174420b41 100644
--- a/lisp/nxml/rng-pttrn.el
+++ b/lisp/nxml/rng-pttrn.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index 4cfa212990d..62082c3f8b1 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 4f49885fc45..81a2ec0b5ec 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 898fe204fd4..a2cfdec276c 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index cd963534402..2580ba9ee7d 100644
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, RelaxNG
+;; Keywords: text, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index 78fa91b5cdc..c616cf22d03 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML
+;; Keywords: text, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 3c33c4c0170..774cda2f540 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: wp, hypermedia, languages, XML, regexp
+;; Keywords: text, hypermedia, languages, XML, regexp
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/obsolete/longlines.el b/lisp/obsolete/longlines.el
index 0f9f73d044b..268f57c0005 100644
--- a/lisp/obsolete/longlines.el
+++ b/lisp/obsolete/longlines.el
@@ -7,7 +7,7 @@
 ;;             Chong Yidong <cyd@stupidchicken.com>
 ;; Maintainer: emacs-devel@gnu.org
 ;; Obsolete-since: 24.4
-;; Keywords: convenience, wp
+;; Keywords: convenience, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/obsolete/ps-def.el b/lisp/obsolete/ps-def.el
index 222f5622b7f..88a972d47e0 100644
--- a/lisp/obsolete/ps-def.el
+++ b/lisp/obsolete/ps-def.el
@@ -4,7 +4,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Keywords: wp, print, PostScript
+;; Keywords: text, print, PostScript
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 ;; Package: ps-print
 ;; Obsolete-since: 29.1
diff --git a/lisp/org/ol-bbdb.el b/lisp/org/ol-bbdb.el
index 47bd9d98cb5..bc298abf363 100644
--- a/lisp/org/ol-bbdb.el
+++ b/lisp/org/ol-bbdb.el
@@ -4,7 +4,7 @@
 
 ;; Authors: Carsten Dominik <carsten.dominik@gmail.com>
 ;;       Thomas Baumann <thomas dot baumann at ch dot tum dot de>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el
index a16a4b39277..828ea49d17a 100644
--- a/lisp/org/ol-bibtex.el
+++ b/lisp/org/ol-bibtex.el
@@ -5,7 +5,7 @@
 ;; Authors: Bastien Guerry <bzg@gnu.org>
 ;;       Carsten Dominik <carsten dot dominik at gmail dot com>
 ;;       Eric Schulte <schulte dot eric at gmail dot com>
-;; Keywords: org, wp, capture
+;; Keywords: org, text, capture
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ol-docview.el b/lisp/org/ol-docview.el
index a9cd9b9950f..926f59cdd1c 100644
--- a/lisp/org/ol-docview.el
+++ b/lisp/org/ol-docview.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-gnus.el b/lisp/org/ol-gnus.el
index 7c07ce0454d..0a7fe90b498 100644
--- a/lisp/org/ol-gnus.el
+++ b/lisp/org/ol-gnus.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-info.el b/lisp/org/ol-info.el
index 350ccf5cc57..cd5258735da 100644
--- a/lisp/org/ol-info.el
+++ b/lisp/org/ol-info.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-man.el b/lisp/org/ol-man.el
index 40fdc8f9237..567fede04c2 100644
--- a/lisp/org/ol-man.el
+++ b/lisp/org/ol-man.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2020-2023 Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;; Maintainer: Bastien Guerry <bzg@gnu.org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-mhe.el b/lisp/org/ol-mhe.el
index 403b5a25483..0ca98174ae7 100644
--- a/lisp/org/ol-mhe.el
+++ b/lisp/org/ol-mhe.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-rmail.el b/lisp/org/ol-rmail.el
index 2877798281d..df97c50ba10 100644
--- a/lisp/org/ol-rmail.el
+++ b/lisp/org/ol-rmail.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol-w3m.el b/lisp/org/ol-w3m.el
index 6fb01a60d59..2ef55b85541 100644
--- a/lisp/org/ol-w3m.el
+++ b/lisp/org/ol-w3m.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008-2023 Free Software Foundation, Inc.
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index cbc02a985c1..5e3dcc987b3 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2018-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 670116304e6..6b7669f67e1 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index e74c59a51d9..831140c5052 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 41872ff87ef..3db9c035577 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 6ab313e1218..14368e49c9b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 475416ecf74..5d83437d34c 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index db5e9283bf5..686a72b7972 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 990214f4117..957dd86b28b 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2007-2023 Free Software Foundation, Inc.
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
-;; Keywords: org, wp
+;; Keywords: org, text
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 035ef047a9d..3874aef03b8 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-duration.el b/lisp/org/org-duration.el
index 2919efd4c77..cc2ed7e84ac 100644
--- a/lisp/org/org-duration.el
+++ b/lisp/org/org-duration.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2023 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 34eb27b6465..48fedfe9edf 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012-2023 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 61083022b82..a84142f5d40 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -4,7 +4,7 @@
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
-;; Keywords: outlines, calendar, wp
+;; Keywords: outlines, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index bb0958033fe..e97188420b2 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index f0b294b4a59..c4712747bdb 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 6bdd0b32fed..72b43f2c630 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-goto.el b/lisp/org/org-goto.el
index 00bf5d46aaa..7d3f814c2e8 100644
--- a/lisp/org/org-goto.el
+++ b/lisp/org/org-goto.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index fb6a48b5f55..e38cdf2a695 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 490e4ddee5b..bcdf1132b09 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index fe52338788c..977594bf016 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index cb7fdf88bde..b83691f1d36 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el
index 0e2967b6cb6..7a716eb5c09 100644
--- a/lisp/org/org-lint.el
+++ b/lisp/org/org-lint.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2015-2023 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 1fc99d0708a..694e3484506 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;         Bastien Guerry <bzg@gnu.org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index 481e431c2f9..7b0725e73df 100644
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2013-2023 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 6ed901b7397..39d40efcac6 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 01395a4b616..cec9188445e 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 2009-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-num.el b/lisp/org/org-num.el
index 807fa66223b..290ac1624d7 100644
--- a/lisp/org/org-num.el
+++ b/lisp/org/org-num.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2018-2023 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index 0567052c089..ecbe3594ed2 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;         John Wiegley <johnw at gnu dot org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 2b07a377e2a..9e72bda863c 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -7,7 +7,7 @@
 ;;       Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;;       Ross Patterson <me AT rpatterson DOT net>
 ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
-;; Keywords: org, emacsclient, wp
+;; Keywords: org, emacsclient, text
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/org-refile.el b/lisp/org/org-refile.el
index 5a41c022fee..ecbf44a6274 100644
--- a/lisp/org/org-refile.el
+++ b/lisp/org/org-refile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;;
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 941399e15a5..1c1efdc1d7b 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;         Bastien Guerry <bzg@gnu.org>
 ;;         Dan Davison <davison at stats dot ox dot ac dot uk>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index d6b7086cddd..f2392a53863 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2004-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-tempo.el b/lisp/org/org-tempo.el
index 81ec8fdccfe..b81beec2eff 100644
--- a/lisp/org/org-tempo.el
+++ b/lisp/org/org-tempo.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2023 Free Software Foundation, Inc.
 ;;
 ;; Author: Rasmus Pank Roulund <emacs at pank dot eu>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 919630e696f..1cc7789c868 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008-2023 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;;
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d1f63762e50..b63df8f59ea 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5,7 +5,7 @@
 ;;
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;; Maintainer: Bastien Guerry <bzg@gnu.org>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 692dd216d61..881a95e3788 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-beamer.el b/lisp/org/ox-beamer.el
index 10a2c803a00..33ab6f30239 100644
--- a/lisp/org/ox-beamer.el
+++ b/lisp/org/ox-beamer.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;;         Nicolas Goaziou <n.goaziou AT gmail DOT com>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: org, wp, tex
+;; Keywords: org, text, tex
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index cfad311207a..08db79dc877 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;      Jambunathan K <kjambunathan at gmail dot com>
 ;; Maintainer: TEC <orgmode@tec.tecosaur.net>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index 81a77a77056..f38aedd2936 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten.dominik@gmail.com>
 ;;      Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ox-koma-letter.el b/lisp/org/ox-koma-letter.el
index 33eb0597b08..04a930bd369 100644
--- a/lisp/org/ox-koma-letter.el
+++ b/lisp/org/ox-koma-letter.el
@@ -7,7 +7,7 @@
 ;;         Viktor Rosenfeld <listuser36 AT gmail DOT com>
 ;;         Rasmus Pank Roulund <emacs AT pank DOT eu>
 ;; Maintainer: Marco Wahl <marcowahlsoft@gmail.com>
-;; Keywords: org, wp, tex
+;; Keywords: org, text, tex
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 768bf402b70..520a51f856c 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;; Maintainer: Daniel Fleischer <danflscr@gmail.com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index bb716f7b9f2..77dc609b061 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/ox-man.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
 ;;      Luis R Anaya <papoanaya aroba hot mail punto com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index 5be0ca22e07..d0ddaabbbe4 100644
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: org, wp, markdown
+;; Keywords: org, text, markdown
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index dd96ed8e064..f5ddedc2ba7 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2023 Free Software Foundation, Inc.
 
 ;; Author: Jambunathan K <kjambunathan at gmail dot com>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 ;; URL: https://orgmode.org
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el
index ed72cf4f2ba..5734510b37b 100644
--- a/lisp/org/ox-org.el
+++ b/lisp/org/ox-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: org, wp
+;; Keywords: org, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index cff34f05882..2a06214d75b 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -3,7 +3,7 @@
 
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: hypermedia, outlines, wp
+;; Keywords: hypermedia, outlines, text
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 5befcac1c39..6616bfd024b 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2012-2023 Free Software Foundation, Inc.
 ;; Author: Jonathan Leech-Pepin <jonathan.leechpepin at gmail dot com>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index e9cc0ed8fc7..5327cc0d41c 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -4,7 +4,7 @@
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;; Keywords: outlines, hypermedia, calendar, wp
+;; Keywords: outlines, hypermedia, calendar, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 735874e8da6..22a6758066f 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -5,7 +5,7 @@
 ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Created: October 21 1996
-;; Keywords: wp, print, postscript, cursive writing
+;; Keywords: text, print, postscript, cursive writing
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/printing.el b/lisp/printing.el
index cb43f7e40dc..a91c82a5522 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, print, PostScript
+;; Keywords: text, print, PostScript
 ;; Old-Version: 6.9.3
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
diff --git a/lisp/progmodes/cl-font-lock.el b/lisp/progmodes/cl-font-lock.el
index 5febf7ff15f..972542cbaf5 100644
--- a/lisp/progmodes/cl-font-lock.el
+++ b/lisp/progmodes/cl-font-lock.el
@@ -6,7 +6,7 @@
 ;; Created: 2019-06-16
 ;; Old-Version: 0.3.0
 ;; Package-Requires: ((emacs "24.5"))
-;; Keywords: lisp wp files convenience
+;; Keywords: lisp text files convenience
 ;; URL: https://github.com/cl-font-lock/cl-font-lock
 
 ;; This file is part of GNU Emacs
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index d05128b88ad..2618ad2b67a 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index d746efbe690..0cc93bc7123 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.10
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 3a2add32d77..b495dacea40 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.1
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 29a50005494..08d422da651 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.2
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index c4d11c97fff..2e015b71aba 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.9
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index 4155dc0d2cd..a4e15c497f1 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.0
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index aaec71daa73..3d2db7e5171 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 1.4
 ;; Package: ebnf2ps
 
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 819f39cb4e5..5573e42b6e7 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, ebnf, PostScript
+;; Keywords: text, ebnf, PostScript
 ;; Old-Version: 4.4
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index bdc28f927ab..0aeb1bed329 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -11,7 +11,7 @@
 
 ;; Author: Kenichi Handa <handa@gnu.org>
 ;; (according to ack.texi)
-;; Keywords: wp, BDF, font, PostScript
+;; Keywords: text, BDF, font, PostScript
 ;; Package: ps-print
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index a4784954627..6a48b6b203b 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -4,7 +4,7 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
-;; Keywords: wp, print, PostScript, multibyte, mule
+;; Keywords: text, print, PostScript, multibyte, mule
 ;; Package: ps-print
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index aa3037f5273..bda483080b9 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -7,7 +7,7 @@
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, print, PostScript
+;; Keywords: text, print, PostScript
 ;; Old-Version: 7.3.5
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index d66d1939801..f4420c497ab 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -7,7 +7,7 @@
 ;;      Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
 ;;      Kenichi Handa <handa@gnu.org> (multi-byte characters)
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: wp, print, PostScript
+;; Keywords: text, print, PostScript
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 ;; Package: ps-print
 
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 004b844a3e7..e977f3a5299 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994-1996, 2001-2023 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
-;; Keywords: wp, faces
+;; Keywords: text, faces
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 4d6c73bfdd6..a75c77cc193 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -4,7 +4,7 @@
 ;; Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp
+;; Keywords: text
 ;; Package: emacs
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index ebb55ec279c..fc7b8c90d83 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017-2023 Free Software Foundation, Inc.
 
-;; Keywords: wp, hypermedia, comm, languages
+;; Keywords: text, hypermedia, comm, languages
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 7374fa63bec..5b07fbef9eb 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985-2023 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp
+;; Keywords: text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 446112bce27..34b673f7ad3 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -4,7 +4,7 @@
 
 ;; Author: Robert J. Chassell <bob@gnu.org>
 ;; (according to ack.texi)
-;; Keywords: wp data
+;; Keywords: text data
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index 86a2762b0ee..589901456a5 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 2001-2023 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp convenience
+;; Keywords: text convenience
 ;; Package: emacs
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index fd28bfe8016..0160f69c3a4 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -4,7 +4,7 @@
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp
+;; Keywords: text
 ;; Package: emacs
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index f98c3963b6f..be5b669bb30 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -4,7 +4,7 @@
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: convenience wp
+;; Keywords: convenience text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index bd8e7cd7435..5893f969fe1 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -4,7 +4,7 @@
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Miles Bader <miles@gnu.org>
-;; Keywords: wp
+;; Keywords: text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 5c53716c3ac..9316c29d4cc 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer: emacs-devel@gnu.org
 ;; Adapted-By: ESR, Daniel Pfeiffer <occitan@esperanto.org>,
 ;;             F.Potorti@cnuce.cnr.it
-;; Keywords: wp, hypermedia, comm, languages
+;; Keywords: text, hypermedia, comm, languages
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 50c3f461bcc..b4138610715 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
 
-;; Keywords: wp, convenience
+;; Keywords: text, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
 
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 7f38a1c463d..c612d3f76fd 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -4,7 +4,7 @@
 ;; Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp
+;; Keywords: text
 ;; Package: emacs
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 18ba83e86e8..0e9aafda305 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -5,7 +5,7 @@
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
 ;;             Michal Nazarewicz <mina86@mina86.com>
 ;; Version:    4.6.1
-;; Keywords:   text, TeX, SGML, wp
+;; Keywords:   text, TeX, SGML, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 23dcc7e5945..d88470d7496 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -4,7 +4,7 @@
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Adapted-By: ESR, Daniel Pfeiffer
-;; Keywords: wp
+;; Keywords: text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index b22652b6824..dd7ddd784c6 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 2001-2023 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
-;; Keywords: wp
+;; Keywords: text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index f4095c99089..f01f3685cfa 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2000-2023 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
-;; Keywords: data, wp
+;; Keywords: data, text
 ;; Version: 13.2.2
 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el
index ef822ba805b..f83f48be951 100644
--- a/test/lisp/textmodes/fill-tests.el
+++ b/test/lisp/textmodes/fill-tests.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2023 Free Software Foundation, Inc.
 
 ;; Author:     Marcin Borkowski <mbork@mbork.pl>
-;; Keywords:   text, wp
+;; Keywords:   text, text
 
 ;; This file is part of GNU Emacs.
 
diff --git a/test/lisp/textmodes/tildify-tests.el b/test/lisp/textmodes/tildify-tests.el
index 962aeb4747c..5b9e1f59974 100644
--- a/test/lisp/textmodes/tildify-tests.el
+++ b/test/lisp/textmodes/tildify-tests.el
@@ -4,7 +4,7 @@
 
 ;; Author:     Michal Nazarewicz <mina86@mina86.com>
 ;; Version:    4.5
-;; Keywords:   text, TeX, SGML, wp
+;; Keywords:   text, TeX, SGML, text
 
 ;; This file is part of GNU Emacs.