Skip to content

Commit 5f0a330

Browse files
authored
Merge pull request #869 from rpjday/about
Minor tweaks (wording, punctuation) to "About Version Control"
2 parents e0b7b07 + 0d559a0 commit 5f0a330

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

book/01-introduction/sections/about-version-control.asc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
=== About Version Control
22

33
(((version control)))
4-
What is "version control", and why should you care?
4+
What is ``version control'', and why should you care?
55
Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later.
6-
For the examples in this book you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
6+
For the examples in this book, you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
77

88
If you are a graphic or web designer and want to keep every version of an image or layout (which you would most certainly want to), a Version Control System (VCS) is a very wise thing to use.
9-
It allows you to revert files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
9+
It allows you to revert selected files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
1010
Using a VCS also generally means that if you screw things up or lose files, you can easily recover.
1111
In addition, you get all this for very little overhead.
1212

@@ -38,20 +38,20 @@ image::images/centralized.png[Centralized version control diagram]
3838

3939
This setup offers many advantages, especially over local VCSs.
4040
For example, everyone knows to a certain degree what everyone else on the project is doing.
41-
Administrators have fine-grained control over who can do what; and it's far easier to administer a CVCS than it is to deal with local databases on every client.
41+
Administrators have fine-grained control over who can do what, and it's far easier to administer a CVCS than it is to deal with local databases on every client.
4242

4343
However, this setup also has some serious downsides.
4444
The most obvious is the single point of failure that the centralized server represents.
4545
If that server goes down for an hour, then during that hour nobody can collaborate at all or save versioned changes to anything they're working on.
46-
If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything the entire history of the project except whatever single snapshots people happen to have on their local machines.
47-
Local VCS systems suffer from this same problem whenever you have the entire history of the project in a single place, you risk losing everything.
46+
If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything -- the entire history of the project except whatever single snapshots people happen to have on their local machines.
47+
Local VCS systems suffer from this same problem -- whenever you have the entire history of the project in a single place, you risk losing everything.
4848

4949
==== Distributed Version Control Systems
5050

5151
(((version control,distributed)))
5252
This is where Distributed Version Control Systems (DVCSs) step in.
53-
In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files: they fully mirror the repository.
54-
Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it.
53+
In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files; rather, they fully mirror the repository, including its full history.
54+
Thus, if any server dies, and these systems were collaborating via that server, any of the client repositories can be copied back up to the server to restore it.
5555
Every clone is really a full backup of all the data.
5656

5757
.Distributed version control.

0 commit comments

Comments
 (0)