diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-16 09:44:04 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-16 09:44:04 -0800 |
| commit | 47106da23ac2b19ad994eed95cdcb0d33535281d (patch) | |
| tree | 689994b90ebbf6d8567d3143aad15a8fec251179 /doc/emacs/files.texi | |
| parent | 4ba32858d61eee16f17b51aca01c15211a0912f8 (diff) | |
| parent | a06a8ed5b66883202ae7182471570dfcabcea973 (diff) | |
| download | emacs-47106da23ac2b19ad994eed95cdcb0d33535281d.tar.gz | |
Merge from origin/emacs-26
a06a8ed (origin/emacs-26) ; * lisp/vc/vc-git.el (vc-git--program-vers...
edc06ad Make 'byte-compile-error-on-warn' a safe file variable
9f5d8da ; * lisp/textmodes/flyspell.el (flyspell-auto-correct-word): ...
f73905a Fix the doc string of flyspell-auto-correct-word
e9c7ddc Improve the MS-Windows appendix of the Emacs manual
6ddb4bd Fix 'vc-git--program-version'
63c93f7 Fix typos and wording in the Emacs manual
42f15b0 * doc/emacs/programs.texi (Semantic): Order programming langu...
b46be29 More improvements for the Emacs manual
874c0ed Minor wording change in Emacs manual
53511f9 Another set of changes for the manual
78426b8 Improvements on tramp.texi
0dca618 Tramp minor doc fixes
Conflicts:
doc/misc/tramp.texi
Diffstat (limited to 'doc/emacs/files.texi')
| -rw-r--r-- | doc/emacs/files.texi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 37d905690cd..bd772e9abc1 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -694,11 +694,12 @@ Otherwise, renaming is the default choice. When a file is managed with a version control system (@pxref{Version Control}), Emacs does not normally make backups in the usual way for -that file. But check-in and check-out are similar in some ways to -making backups. One unfortunate similarity is that these operations -typically break hard links, disconnecting the file name you visited from -any alternate names for the same file. This has nothing to do with -Emacs---the version control system does it. +that file. But @dfn{committing} (a.k.a.@: @dfn{checking in}, +@pxref{VCS Concepts}) new versions of files is similar in some ways +to making backups. One unfortunate similarity is that these +operations typically break hard links, disconnecting the file name you +visited from any alternate names for the same file. This has nothing +to do with Emacs---the version control system does it. @node Customize Save @subsection Customizing Saving of Files |