Merge from savannah/emacs-30

709ce2aff14 Port to Haiku R1/beta5
21efdd5ef31 Fix c++-ts-mode font-lock for latest c++ grammar (bug#73191)
ffc00eac53d ; Set Transient's version and add admin/MAINTAINERS entry
3822a5e5d12 * admin/update-copyright: Print reminder to do manual upd...
43b678d3d26 * admin/notes/years: Update.
38de992a5a3 * etc/TODO: New item "support indentation guides".

# Conflicts:
#	admin/notes/years
#	doc/misc/transient.texi
#	lisp/progmodes/c-ts-mode.el
#	lisp/transient.el

1 files changed, 20 insertions, 19 deletions

diff --git a/admin/notes/years b/admin/notes/years
index 2a961536da6..9c0b9a81886 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -1,6 +1,6 @@
 HOW TO MAINTAIN COPYRIGHT YEARS FOR GNU EMACS
 
-Maintaining copyright years is now very simple: every time a new year
+Maintaining copyright years is very simple: every time a new year
 rolls around, add that year to every FSF (and AIST) copyright notice.
 Do this by running the 'admin/update-copyright' script on a fresh repo
 checkout, redirecting its output to a file, so that you could later
@@ -20,16 +20,19 @@ A few known problems with the build-aux/update-copyright script:
   . it doesn't update the second Copyright notice, the one that gets
     output into PDF and PS, in etc/refcards/ru-refcard.tex
   . it doesn't update etc/refcards/gnus-refcard.tex, doc/misc/org.org,
-    and nt/*.rc.in because their Copyright statements have a
-    non-standard format
-  . several README and XPM files under etc/images/
-    (e.g. etc/images/gud/README), and also etc/refcards/README,
-    msdos/README, and nt/icons/README aren't updated either
-  - the copyright notices for headers generated by exec/configure.ac and
-    by configure.ac are not updated as the file already bears a notice
-    above it
-
-These files need to be updated by hand.
+    nt/emacs.rc.in, and nt/emacsclient.rc.in, because their Copyright
+    statements have a non-standard format
+  . several README files under etc/images/, and also
+    etc/refcards/README, msdos/README, and nt/icons/README aren't
+    updated either
+  . the copyright notices for headers generated by configure.ac and
+    exec/configure.ac are not updated as the files already bear notices
+    above them
+  . the example copyright year in doc/lispref/tips.texi is not updated
+
+These files need to be updated by hand, however note that the above list
+is not necessarily exhaustive.  For that reason, it's best to grep for
+something like "\<202[0-4]\>" and check any hits manually.
 
 Next, run "M-x set-copyright" from admin.el, which updates several
 copyright notices in the Emacs sources.
@@ -42,23 +45,21 @@ ETAGS.good* and CTAGS.good files, and then commit the new test files.
 
 There's no need to worry about whether an individual file has changed
 in a given year - it's sufficient that Emacs as a whole has changed.
-
 Therefore the years are updated en-masse near the start of each year,
 so basically there is no need for most people to do any updating of them.
 
-The current (in 2011) version of "Information for Maintainers of GNU
-Software" (see that document for more details) says that it is OK to use
-ranges in copyright years, so in early 2011 the years were changed to use
-ranges, which occupy less space and do not grow in length every year.
+The refcards in etc/refcards can print only the latest copyright year,
+but should keep the full list in a comment in the source.
 
 For more detailed information on maintaining copyright, see the file
 "copyright" in this directory.
 
 The previous policy was more complex, but is now only of historical
-interest (see versions of this file from before 2009).
+interest (see versions of this file from before 2009).  In early 2011,
+the years were changed to use ranges.  This is OK according to changes
+made to "Information for Maintainers of GNU Software" that same year
+(see that document for more details).
 
-The refcards in etc/refcards can print only the latest copyright year,
-but should keep the full list in a comment in the source.
 
 
 "Our lawyer says it is ok if we add, to each file that has been in Emacs