aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Whitton2025-07-15 12:43:25 +0100
committerSean Whitton2025-07-15 12:43:31 +0100
commit8fb0e33a10f07799d693ddbfb4e99e1549b72032 (patch)
treeaf4ef631a8d41cb7c9875900be2c9f794443cc17
parent105ae06031a548e1afd7b7a992c1da783f498534 (diff)
downloademacs-8fb0e33a10f07799d693ddbfb4e99e1549b72032.tar.gz
emacs-8fb0e33a10f07799d693ddbfb4e99e1549b72032.zip
; Wording fixes in VC docs.
-rw-r--r--doc/emacs/maintaining.texi16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 84191490e50..ffa3b7f2a58 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -71,7 +71,7 @@ changed.
71@cindex VC 71@cindex VC
72 The Emacs version control interface is called @dfn{VC}@. VC 72 The Emacs version control interface is called @dfn{VC}@. VC
73commands work with several different version control systems; 73commands work with several different version control systems;
74currently, it supports Bazaar, CVS, Git, Mercurial, Monotone, RCS, 74currently, it supports Bazaar, CVS, Git, Mercurial, RCS,
75SRC, SCCS/CSSC, and Subversion. Of these, the GNU project distributes 75SRC, SCCS/CSSC, and Subversion. Of these, the GNU project distributes
76CVS, RCS, and Bazaar. 76CVS, RCS, and Bazaar.
77 77
@@ -132,11 +132,11 @@ the fileset.)
132 VC allows you to use a version control system from within Emacs, 132 VC allows you to use a version control system from within Emacs,
133integrating the version control operations smoothly with editing. It 133integrating the version control operations smoothly with editing. It
134provides a uniform interface for common operations in many version 134provides a uniform interface for common operations in many version
135control operations. 135control systems.
136 136
137 Some uncommon or intricate version control operations, such as 137 Some uncommon or intricate version control operations, such as
138altering repository settings, are not supported in VC@. You should 138altering repository settings, are not supported in VC@. You should
139perform such tasks outside VC, e.g., via the command line. 139perform such tasks outside VC, e.g., at the command line.
140 140
141 This section provides a general overview of version control, and 141 This section provides a general overview of version control, and
142describes the version control systems that VC supports. You can skip 142describes the version control systems that VC supports. You can skip
@@ -180,9 +180,9 @@ important form of communication among developers.
180@node Version Control Systems 180@node Version Control Systems
181@subsubsection Supported Version Control Systems 181@subsubsection Supported Version Control Systems
182 182
183@cindex back end (version control) 183@cindex backend (version control)
184 VC currently works with many different version control systems, 184 VC currently works with many different version control systems,
185which it refers to as @dfn{back ends}: 185which it refers to as @dfn{backends}:
186 186
187@itemize @bullet 187@itemize @bullet
188 188
@@ -263,7 +263,7 @@ supports almost all SRC operations.
263@cindex repository 263@cindex repository
264@cindex registered file 264@cindex registered file
265 When a file is under version control, we say that it is 265 When a file is under version control, we say that it is
266@dfn{registered} in the version control system. The system has a 266@dfn{registered} with the version control system. The system has a
267@dfn{repository} which stores both the file's present state and its 267@dfn{repository} which stores both the file's present state and its
268change history---enough to reconstruct the current version or any 268change history---enough to reconstruct the current version or any
269earlier version. The repository also contains other information, such 269earlier version. The repository also contains other information, such
@@ -409,8 +409,8 @@ modification log for the entire system, which makes change log files
409somewhat redundant. One advantage that they retain is that it is 409somewhat redundant. One advantage that they retain is that it is
410sometimes useful to be able to view the transaction history of a 410sometimes useful to be able to view the transaction history of a
411single directory separately from those of other directories. Another 411single directory separately from those of other directories. Another
412advantage is that commit logs can't be fixed in many version control 412advantage is that mistakes in commit logs can't be fixed in many version
413systems. 413control systems.
414 414
415 A project maintained with version control can use just the version 415 A project maintained with version control can use just the version
416control log, or it can use both kinds of logs. It can handle some 416control log, or it can use both kinds of logs. It can handle some