Indent with two spaces in zh files

converted tabs to spaces also. but these commits is limited in the zh
version.

the reason I did this:

 - long lines is prone to conflict
 - the use of tab disturbs the indentation when switching editors
   without proper tab space setting, which you may never get it right.
   so why not give up and use spaces instead.

those changes is limited to the zh translation.

Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	.gitignore
	_layouts/zh_reference.html
	zh/basic/index.html
	zh/branching/index.html
	zh/creating/index.html
	zh/index.html
	zh/inspect/index.html
	zh/remotes/index.html

Author: cyjake

.gitignore

@@ -1,5 +1,4 @@
 _site
 *~
-\.*.swp
-.gitignore
+.*.swp
 .DS_Store

LICENSE.md

@@ -1,7 +1,7 @@
 Introduction
 (how git is different)
 
-Getting and Creating Projects 
+Getting & Creating Projects 
 * init
 * clone
 

NOTES

@@ -27,7 +27,7 @@
           <!-- <li><a id="menu_cookbook" href="/cookbook.html">Cookbook</a></li> -->
 					<li><a id="menu_about" href="/about.html">About</a></li>
 					<li>&#167;</li>
-					<li><a href="http://github.com/schacon/git-reference">Site Source</a></li>
+					<li><a href="http://github.com/github/git-reference">Site Source</a></li>
         </ul>
         <br/>
         &nbsp;

_layouts/reference.html

@@ -8,8 +8,8 @@
 		<link rel="stylesheet" type="text/css" href="/css/grid.css" media="screen" />
 		<link rel="stylesheet" type="text/css" href="/css/layout.css" media="screen" />
 		<link rel="stylesheet" type="text/css" href="/css/nav.css" media="screen" />
-		<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/zh//css/ie6.css" media="screen" /><![endif]-->
-		<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/zh//css/ie.css" media="screen" /><![endif]-->
+		<!--[if IE 6]><link rel="stylesheet" type="text/css" href="/css/ie6.css" media="screen" /><![endif]-->
+		<!--[if IE 7]><link rel="stylesheet" type="text/css" href="/css/ie.css" media="screen" /><![endif]-->
 		<script type="text/javascript" src="/js/jquery-1.4.1.min.js"></script>
 		<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
 		<script type="text/javascript" src="/js/action.js"></script>
@@ -27,7 +27,7 @@
           <!-- <li><a id="menu_cookbook" href="/zh/cookbook.html">Cookbook</a></li> -->
 					<li><a id="menu_about" href="/zh/about.html">关于</a></li>
 					<li>&#167;</li>
-					<li><a href="https://github.com/schacon/git-reference">网站源码</a></li>
+					<li><a href="http://github.com/github/git-reference">网站源码</a></li>
         </ul>
         <br/>
         &nbsp;

_layouts/zh_reference.html

@@ -38,7 +38,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-add.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-add">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-2.html#tracking_new_files">book</a>
     </span>
     <a name="add">git add</a>
@@ -130,7 +130,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-status.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-status">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-2.html#checking_the_status_of_your_files">book</a>
     </span>
     <a name="status">git status</a>
@@ -214,7 +214,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-diff">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-2.html#viewing_your_staged_and_unstaged_changes">book</a>
     </span>
     <a name="diff">git diff</a>
@@ -416,7 +416,7 @@ <h4>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-commit">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-2.html#committing_your_changes">book</a>
     </span>
     <a name="commit">git commit</a>
@@ -596,7 +596,7 @@ <h4>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-reset.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-reset">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-4.html#unstaging_a_staged_file">book</a>
     </span>
     <a name="reset">git reset HEAD</a>
@@ -694,7 +694,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a href="http://www.kernel.org/pub/software/scm/git/docs/git-rm.html">docs</a> &nbsp;
+      <a href="http://git-scm.com/docs/git-rm">docs</a> &nbsp;
       <a href="http://progit.org/book/ch2-2.html#removing_files">book</a>
     </span>
     <a name="rm-mv">git rm</a>
@@ -747,5 +747,5 @@ <h4>
   </div>
 </div>
 
-<p><a href="/branching">On to Branching and Merging &#187;</a></p>
+<p><a class="page-button next-page" href="/branching">On to Branching and Merging &#187;</a></p>
 

basic/index.html

@@ -38,7 +38,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-branch.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-branch">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
     </span>
     <a name="branch">git branch</a>
@@ -49,7 +49,7 @@ <h2>
 
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-checkout">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch3-2.html">book</a>
     </span>
     <a name="checkout">git checkout</a>
@@ -226,7 +226,7 @@ <h4>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-merge">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch3-2.html#basic_merging">book</a>
     </span>
     <a name="merge">git merge</a>
@@ -292,7 +292,6 @@ <h4>
 
 <pre>
 <b>$ git checkout -b change_class</b>
-M hello.rb
 Switched to a new branch 'change_class'
 <b>$ vim hello.rb </b>
 <b>$ head -1 hello.rb </b>
@@ -421,7 +420,7 @@ <h4>
     <p>You can see that Git inserts standard merge conflict markers, much like
       Subversion, into files when it gets a merge conflict.  Now it's up to us
       to resolve them.  We will do it manually here, but check out
-      <a href="http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html">git mergetool</a>
+      <a href="http://git-scm.com/docs/git-mergetool">git mergetool</a>
       if you want Git to fire up a graphical mergetool
       (like kdiff3, emerge, p4merge, etc) instead.
     </p>
@@ -473,7 +472,7 @@ <h4>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-log.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-log">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch6-1.html#commit_ranges">book</a>
     </span>
     <a name="log">git log</a>
@@ -665,6 +664,9 @@ <h2>
       front of the branch that we don't want to see.  For instance, if we want
       to see the commits that are in the 'erlang' branch that are not in the
       'master' branch, we can do <code>erlang ^master</code>, or vice versa.
+      Note that the Windows command-line treats <code>^</code> as a special
+      character, in which case you'll need to surround <code>^master</code>
+      in quotes.
     </p>
 
 <pre>
@@ -693,7 +695,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-tag.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-tag">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-6.html">book</a>
     </span>
     <a name="tag">git tag</a>
@@ -775,5 +777,5 @@ <h2>
   </div>
 </div>
 
-<p><a href="/remotes">On to Sharing and Updating Projects &#187;</a></p>
+<p><a class="page-button next-page" href="/remotes">On to Sharing and Updating Projects &#187;</a></p>
 

branching/index.html

@@ -23,7 +23,7 @@ <h2>Getting and Creating Projects</h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-init.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-init">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-1.html#initializing_a_repository_in_an_existing_directory">book</a>
     </span>
     <a name="init">git init</a>
@@ -74,7 +74,7 @@ <h2>
 <div class="box">
   <h2>
     <span class="docs">
-      <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-clone.html">docs</a> &nbsp;
+      <a target="new" href="http://git-scm.com/docs/git-clone">docs</a> &nbsp;
       <a target="new" href="http://progit.org/book/ch2-1.html#cloning_an_existing_repository">book</a>
     </span>
     <a name="clone">git clone</a>
@@ -134,4 +134,4 @@ <h2>
   </div>
 </div>
 
-<p><a href="/basic">On to Basic Snapshotting &#187;</a></p>
+<p><a class="page-button next-page" href="/basic">On to Basic Snapshotting &#187;</a></p>