[Emacs-diffs] master 012338f 01/11: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 012338f34ea037929ac018bd8e044c51acfc6a2e
Merge: bfc1dfd 9c6f35a
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    9c6f35a * doc/lispref/files.texi (Unique File Names): Fix a typo.  (B...
---
 doc/lispref/files.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index a692bb2..f4678dd 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2571,10 +2571,10 @@ This function creates a temporary file and returns its 
name.  Emacs
 creates the temporary file's name by adding to @var{prefix} some
 random characters that are different in each Emacs job.  The result is
 guaranteed to be a newly created file, containing @var{text} if that's
-given as a string and empty otherwise. On MS-DOS, this function
-can truncate the @var{string} prefix to fit into the 8+3 file-name
-limits.  If @var{prefix} is a relative file name, it is expanded
-against @code{temporary-file-directory}.
+given as a string and empty otherwise. On MS-DOS, this function can
+truncate @var{prefix} to fit into the 8+3 file-name limits.  If
address@hidden is a relative file name, it is expanded against
address@hidden
 
 @example
 @group