[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Merge branch 'hotfix/gh448' (3ec488b6)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/3ec488b615e2641903ad9dd33fc49298c3407a1b

>---------------------------------------------------------------

commit 3ec488b615e2641903ad9dd33fc49298c3407a1b
Merge: dc44b300 5f509bc2
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jan 7 15:39:08 2021 +0100

    Merge branch 'hotfix/gh448'
    
    # Conflicts:
    #       base/changes.txt


>---------------------------------------------------------------

3ec488b615e2641903ad9dd33fc49298c3407a1b
 base/build.lua         |   1 +
 base/changes.txt       |  11 +-
 base/doc/usrguide3.tex | 701 +++++++++++++++++++++++++++++++++++++++++++++++++
 base/manifest.txt      |   1 +
 4 files changed, 713 insertions(+), 1 deletion(-)

diff --cc base/changes.txt
index cc8d59b6,105887b8..09e4082d
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -10,33 -10,11 +10,42 @@@ are not part of the distribution
  All changes above are only part of the development branch for the next release.
  ================================================================================
  
 +#########################
++# 2020-10-01 PL 4 Release
++#########################
++
+ 2020-12-03  Joseph Wright  <Joseph.Wright at latex-project.org>
+ 
+         * usrguide3.tex
+           New file to cover creation of document commands
+ 
++#########################
 +# 2020-10-01 PL 3 Release
 +#########################
 +
 +2020-12-18  Phelype Oleinik  <phelype.oleinik at latex-project.org>
 +
 +	* lthooks.dtx:
 +	Moved 'top-level' code label at the very end of hooks.
 +	- In reverse hooks, 'top-level' goes at the beginning.
 +	- 'top-level' cannot be used as a label outside of the top-level.
 +	- The label for the 'top-level' cannot be changed.
 +	- Simplified internal managing of default label.
 +	Renamed \DeclareDefaultHookLabel to \SetDefaultHookLabel (the old name
 +		will be kept until the next release).
 +	Provide \PushDefaultHookLabel and \PopDefaultHookLabel.
 +	Fixed a small bug in \ShowHook and \LogHook.
 +
 +	* ltclass.dtx:
 +	Remove \@expl@@@hook at curr@name at push@@n from \@pushfilename to
 +		follow changes to lthooks.dtx.
 +
 +2020-12-10  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltfssbas.dtx (subsection{Macros for the user}):
 +	Drop ``m'' if the series value is a member of a fixed list
 +	and issue warning if doing it (gh/453)
 +
  2020-11-24  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
  	* latexrelease.ins: