Merge from origin/emacs-27

3ba0db41e3 Allow optional truncation of tab names in tab-bar and tab-...
7dd065fc7b Small fixes in documentation.
06166aa719 Improve explanation of available font backends under X
2eb834ead4 Clear output data pointer on NS

2 files changed, 5 insertions, 5 deletions

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 5a64425f271..fba4389094f 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -720,8 +720,8 @@ should create non-existent directories in @var{new}.
 Dired automatically changes the visited file name of buffers associated
 with renamed files so that they refer to the new names.
 
-@vindex dired-vc-rename
-If the value of the variable @code{dired-vc-rename} is non-@code{nil},
+@vindex dired-vc-rename-file
+If the value of the variable @code{dired-vc-rename-file} is non-@code{nil},
 files are renamed using the commands of the underlying VCS, via
 @code{vc-rename-file} (@pxref{VC Delete/Rename}).
 
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 171a9bc06fc..3665faf3a8f 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -122,14 +122,14 @@ setting the variables @code{undo-limit}, @code{undo-strong-limit}, and
   The variable @code{undo-limit} sets a soft limit: Emacs keeps undo
 data for enough commands to reach this size, and perhaps exceed it,
 but does not keep data for any earlier commands beyond that.  Its
-default value is 80000.  The variable @code{undo-strong-limit} sets a
+default value is 160000.  The variable @code{undo-strong-limit} sets a
 stricter limit: any previous command (though not the most recent one)
 that pushes the size past this amount is forgotten.  The default value
-of @code{undo-strong-limit} is 120000.
+of @code{undo-strong-limit} is 240000.
 
   Regardless of the values of those variables, the most recent change
 is never discarded unless it gets bigger than @code{undo-outer-limit}
-(normally 12,000,000).  At that point, Emacs discards the undo data and
+(normally 24,000,000).  At that point, Emacs discards the undo data and
 warns you about it.  This is the only situation in which you cannot
 undo the last command.  If this happens, you can increase the value of
 @code{undo-outer-limit} to make it even less likely to happen in the