From 24db241669ee644739f70de95f5825a3b11c79a6 Mon Sep 17 00:00:00 2001
From: Ben Lynn <benlynn@gmail.com>
Date: Fri, 5 Dec 2008 00:10:05 -0800
Subject: [PATCH] Added link to Chinese translation.

Mentioned git whatchanged.
---
 basic.txt       | 14 +++++++++-----
 branch.txt      |  2 +-
 grandmaster.txt |  6 +++---
 preface.txt     |  3 ++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/basic.txt b/basic.txt
index a495a87..86e476d 100644
--- a/basic.txt
+++ b/basic.txt
@@ -148,8 +148,12 @@ Or between a particular version and 2 versions ago:
 
  $ git diff SHA1_HASH "@{2}"
 
-Instead of running log and diff directly, sometimes I'll browse history with
-http://sourceforge.net/projects/qgit[qgit], due to its slick photogenic
-interface, or http://jonas.nitro.dk/tig/[tig], a text-mode interface that works
-well over slow connections. Alternatively, install a web server, run
-*git instaweb* and fire up any web browser.
+Try also:
+
+ $ git whatchanged --since="2 weeks ago"
+
+Often I'll browse history with http://sourceforge.net/projects/qgit[qgit]
+instead, due to its slick photogenic interface, or
+http://jonas.nitro.dk/tig/[tig], a text-mode interface that works well over
+slow connections. Alternatively, install a web server, run *git instaweb* and
+fire up any web browser.
diff --git a/branch.txt b/branch.txt
index e2fc959..e549bce 100644
--- a/branch.txt
+++ b/branch.txt
@@ -6,7 +6,7 @@ Instant branching and merging are the most lethal of Git's killer features.
 bug manifests in the released version without warning. The deadline for a
 certain feature is moved closer. A developer whose help you need for a key section of the project is about to leave. In all cases, you must abruptly drop what you are doing and focus on a completely different task.
 
-Interrupting your train of thought can be detrimental to your productivity, and the slower and less convenient it is to switch contexts, the greater the loss. With centralized version control we must download a fresh working copy from the central server. Distributed systems fare better, as we can clone the desired version locally.
+Interrupting your train of thought can be detrimental to your productivity, and the more cumbersome it is to switch contexts, the greater the loss. With centralized version control we must download a fresh working copy from the central server. Distributed systems fare better, as we can clone the desired version locally.
 
 But cloning still entails copying the whole working directory as well as the entire history up to the given point. Even though Git reduces the cost of this with file sharing and hard links, the project files themselves must be recreated in their entirety in the new working directory.
 
diff --git a/grandmaster.txt b/grandmaster.txt
index 3d6f813..1bb897a 100644
--- a/grandmaster.txt
+++ b/grandmaster.txt
@@ -16,13 +16,13 @@ It's good practice to keep a http://en.wikipedia.org/wiki/Changelog[changelog],
 
 === Git Over SSH, HTTP ===
 
-Suppose you have ssh access to your web server, but it does not have Git installed. Then download, compile and install Git in your account.
+Suppose you have ssh access to a web server, but Git is not installed. Though less efficient than its native protocol, Git can communicate over HTTP.
 
-Create a repository in your web directory:
+Download, compile and install Git in your account, and create a repository in your web directory:
 
  $ GIT_DIR=proj.git git init
 
-and in the "proj.git" directory, run
+In the "proj.git" directory, run:
 
  $ git --bare update-server-info
  $ chmod a+x hooks/post-update
diff --git a/preface.txt b/preface.txt
index 9247f3e..c42c7c4 100644
--- a/preface.txt
+++ b/preface.txt
@@ -12,6 +12,7 @@ Rather than go into details, we provide rough instructions for particular effect
 
 .Other Editions
 
+ - http://docs.google.com/View?id=dfwthj68_675gz3bw8kj[Chinese translation]: by JunJie, Meng and JiangWei.
  - link:book.html[Single webpage]: barebones HTML, with no CSS.
  - link:book.pdf[PDF file]: printer-friendly.
 
@@ -24,7 +25,7 @@ Kudos to Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone,
 This guide is released under http://www.gnu.org/licenses/gpl-3.0.html[the GNU General Public License version 3]. Naturally, the source is kept in a Git
 repository, and can be obtained by typing:
 
- $ git clone http://repo.or.cz/r/gitmagic.git  # Creates "gitmagic" directory.
+ $ git clone git://repo.or.cz/gitmagic.git  # Creates "gitmagic" directory.
 
 See below for other mirrors.
 
-- 
2.11.4.GIT