From: Frank Li <lznuaa@gmail.com>
Date: Tue, 3 Mar 2009 14:55:11 +0000 (+0800)
Subject: Git user manual okay
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=d0df01c5c04b488b34c4e4c78861f695f4f0731b

Git user manual okay

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

diff --git a/doc/source/en/TortoiseGit/git_doc/git-doc.xml b/doc/source/en/TortoiseGit/git_doc/git-doc.xml
index 2bd1ff1..a5699c3 100644
--- a/doc/source/en/TortoiseGit/git_doc/git-doc.xml
+++ b/doc/source/en/TortoiseGit/git_doc/git-doc.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE chapter SYSTEM "../../../dtd/dblite.dtd">
 <part>
 <title>Git Offical Document</title>
-	<chapter id="user manual" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<chapter id="user-manual" xmlns:xi="http://www.w3.org/2001/XInclude">
 		<title>Git User Manual</title>
 		<xi:include href="./user-manual.xml"/>
 	</chapter>
@@ -10,6 +10,6 @@
 	<chapter id="git-command" xmlns:xi="http://www.w3.org/2001/XInclude">
 		<title>Git Command Reference</title>
		<xi:include href="./git.html.xml"/>
		<xi:include href="./git-add.html.xml"/>
 		<xi:include href="./git-am.html.xml"/>
		<xi:include href="./git-annotate.html.xml"/>
-		<xi:include href="./git-apply.html.xml"/>
		<xi:include href="./git-archimport.html.xml"/>
		<xi:include href="./git-archive.html.xml"/>
		
		<xi:include href="./git-bisect.html.xml"/>
		<xi:include href="./git-blame.html.xml"/>
		<xi:include href="./git-branch.html.xml"/>
		<xi:include href="./git-bundle.html.xml"/>
		
		<xi:include href="./git-cat-file.html.xml"/>
		<xi:include href="./git-check-attr.html.xml"/>
		<xi:include href="./git-checkout.html.xml"/>
		<xi:include href="./git-checkout-index.html.xml"/>
		<xi:include href="./git-check-ref-format.html.xml"/>
		<xi:include href="./git-cherry.html.xml"/>
		<xi:include href="./git-cherry-pick.html.xml"/>
		<xi:include href="./git-citool.html.xml"/>
		<xi:include href="./git-clean.html.xml"/>
		<xi:include href="./git-clone.html.xml"/>
		<xi:include href="./git-commit.html.xml"/>
		<xi:include href="./git-commit-tree.html.xml"/>
		<xi:include href="./git-config.html.xml"/>
		<xi:include href="./git-count-objects.html.xml"/>
		<xi:include href="./git-cvsexportcommit.html.xml"/>
		<xi:include href="./git-cvsimport.html.xml"/>
		<xi:include href="./git-cvsserver.html.xml"/>
		
		<xi:include href="./git-daemon.html.xml"/>
		<xi:include href="./git-describe.html.xml"/>
		
		<xi:include href="./git-diff.html.xml"/>
		<xi:include href="./git-diff-files.html.xml"/>
		<xi:include href="./git-diff-index.html.xml"/>
		<xi:include href="./git-diff-tree.html.xml"/>
		<xi:include href="./git-fast-export.html.xml"/>
		<xi:include href="./git-fast-import.html.xml"/>
		<xi:include href="./git-fetch.html.xml"/>
		<xi:include href="./git-fetch-pack.html.xml"/>
		<xi:include href="./git-filter-branch.html.xml"/>
		<xi:include href="./git-fmt-merge-msg.html.xml"/>
		<xi:include href="./git-for-each-ref.html.xml"/>
		<xi:include href="./git-format-patch.html.xml"/>
		<xi:include href="./git-fsck.html.xml"/>
		<xi:include href="./git-fsck-objects.html.xml"/>
		<xi:include href="./git-gc.html.xml"/>
		<xi:include href="./git-get-tar-commit-id.html.xml"/>
		<xi:include href="./git-grep.html.xml"/>
		
		<xi:include href="./git-gui.html.xml"/>
		<xi:include href="./git-hash-object.html.xml"/>
		<xi:include href="./git-help.html.xml"/>
		<xi:include href="./git-http-fetch.html.xml"/>
		<xi:include href="./git-http-push.html.xml"/>
		<xi:include href="./git-imap-send.html.xml"/>
		<xi:include href="./git-index-pack.html.xml"/>
		<xi:include href="./git-init.html.xml"/>
		<xi:include href="./git-init-db.html.xml"/>
		<xi:include href="./git-instaweb.html.xml"/>
		<xi:include href="./git-log.html.xml"/>
		<xi:include href="./git-lost-found.html.xml"/>
		<xi:include href="./git-ls-files.html.xml"/>
		<xi:include href="./git-ls-remote.html.xml"/>
		<xi:include href="./git-ls-tree.html.xml"/>
		<xi:include href="./git-mailinfo.html.xml"/>
		<xi:include href="./git-mailsplit.html.xml"/>
		
		<xi:include href="./git-merge.html.xml"/>
		<xi:include href="./git-merge-base.html.xml"/>
		<xi:include href="./git-merge-file.html.xml"/>
		<xi:include href="./git-merge-index.html.xml"/>
		<xi:include href="./git-merge-one-file.html.xml"/>
		<xi:include href="./git-mergetool.html.xml"/>
		<xi:include href="./git-merge-tree.html.xml"/>
		<xi:include href="./git-mktag.html.xml"/>
		<xi:include href="./git-mktree.html.xml"/>
		<xi:include href="./git-mv.html.xml"/>
		
		<xi:include href="./git-name-rev.html.xml"/>
		<xi:include href="./git-notes.html.xml"/>
		<xi:include href="./git-pack-objects.html.xml"/>
		<xi:include href="./git-pack-redundant.html.xml"/>
		<xi:include href="./git-pack-refs.html.xml"/>
		<xi:include href="./git-parse-remote.html.xml"/>
		<xi:include href="./git-patch-id.html.xml"/>
		
		<xi:include href="./git-peek-remote.html.xml"/>
		<xi:include href="./git-prune.html.xml"/>
		<xi:include href="./git-prune-packed.html.xml"/>
		<xi:include href="./git-pull.html.xml"/>
		<xi:include href="./git-push.html.xml"/>
		<xi:include href="./git-quiltimport.html.xml"/>
		<xi:include href="./git-read-tree.html.xml"/>
		<xi:include href="./git-rebase.html.xml"/>
		<xi:include href="./git-receive-pack.html.xml"/>
		<xi:include href="./git-reflog.html.xml"/>
		<xi:include href="./git-relink.html.xml"/>
		<xi:include href="./git-remote.html.xml"/>
		<xi:include href="./git-repack.html.xml"/>
		<xi:include href="./git-repo-config.html.xml"/>
		<xi:include href="./git-request-pull.html.xml"/>
		
		<xi:include href="./git-rerere.html.xml"/>
		<xi:include href="./git-reset.html.xml"/>
	
		<xi:include href="./git-revert.html.xml"/>
		<xi:include href="./git-rev-list.html.xml"/>
		<xi:include href="./git-rev-parse.html.xml"/>
		<xi:include href="./git-rm.html.xml"/>
		<xi:include href="./git-send-email.html.xml"/>
		<xi:include href="./git-send-pack.html.xml"/>
		<xi:include href="./git-shell.html.xml"/>
		<xi:include href="./git-shortlog.html.xml"/>
		<xi:include href="./git-show.html.xml"/>
		<xi:include href="./git-show-branch.html.xml"/>
		<xi:include href="./git-show-index.html.xml"/>
		<xi:include href="./git-show-ref.html.xml"/>
		<xi:include href="./git-sh-setup.html.xml"/>
		<xi:include href="./git-stage.html.xml"/>
		<xi:include href="./git-stash.html.xml"/>
		<xi:include href="./git-status.html.xml"/>
		<xi:include href="./git-stripspace.html.xml"/>
	<!--
		<xi:include href="./git-submodule.html.xml"/>
		<xi:include href="./git-svn.html.xml"/>
		<xi:include href="./git-symbolic-ref.html.xml"/>
		<xi:include href="./git-tag.html.xml"/>
		<xi:include href="./git-tar-tree.html.xml"/>
		<xi:include href="./git-tools.xml"/>
		<xi:include href="./git-unpack-file.html.xml"/>
		<xi:include href="./git-unpack-objects.html.xml"/>
		<xi:include href="./git-update-index.html.xml"/>
		<xi:include href="./git-update-ref.html.xml"/>
		<xi:include href="./git-update-server-info.html.xml"/>
		<xi:include href="./git-upload-archive.html.xml"/>
		<xi:include href="./git-upload-pack.html.xml"/>
		<xi:include href="./git-var.html.xml"/>
		
		<xi:include href="./git-verify-pack.html.xml"/>
		<xi:include href="./git-verify-tag.html.xml"/>
		
		<xi:include href="./git-whatchanged.html.xml"/>
		<xi:include href="./git-write-tree.html.xml"/
	-->	
+		<xi:include href="./git-apply.html.xml"/>
		<xi:include href="./git-archimport.html.xml"/>
		<xi:include href="./git-archive.html.xml"/>
		
		<xi:include href="./git-bisect.html.xml"/>
		<xi:include href="./git-blame.html.xml"/>
		<xi:include href="./git-branch.html.xml"/>
		<xi:include href="./git-bundle.html.xml"/>
		
		<xi:include href="./git-cat-file.html.xml"/>
		<xi:include href="./git-check-attr.html.xml"/>
		<xi:include href="./git-checkout.html.xml"/>
		<xi:include href="./git-checkout-index.html.xml"/>
		<xi:include href="./git-check-ref-format.html.xml"/>
		<xi:include href="./git-cherry.html.xml"/>
		<xi:include href="./git-cherry-pick.html.xml"/>
		<xi:include href="./git-citool.html.xml"/>
		<xi:include href="./git-clean.html.xml"/>
		<xi:include href="./git-clone.html.xml"/>
		<xi:include href="./git-commit.html.xml"/>
		<xi:include href="./git-commit-tree.html.xml"/>
		<xi:include href="./git-config.html.xml"/>
		<xi:include href="./git-count-objects.html.xml"/>
		<xi:include href="./git-cvsexportcommit.html.xml"/>
		<xi:include href="./git-cvsimport.html.xml"/>
		<xi:include href="./git-cvsserver.html.xml"/>
		
		<xi:include href="./git-daemon.html.xml"/>
		<xi:include href="./git-describe.html.xml"/>
		
		<xi:include href="./git-diff.html.xml"/>
		<xi:include href="./git-diff-files.html.xml"/>
		<xi:include href="./git-diff-index.html.xml"/>
		<xi:include href="./git-diff-tree.html.xml"/>
		<xi:include href="./git-fast-export.html.xml"/>
		<xi:include href="./git-fast-import.html.xml"/>
		<xi:include href="./git-fetch.html.xml"/>
		<xi:include href="./git-fetch-pack.html.xml"/>
		<xi:include href="./git-filter-branch.html.xml"/>
		<xi:include href="./git-fmt-merge-msg.html.xml"/>
		<xi:include href="./git-for-each-ref.html.xml"/>
		<xi:include href="./git-format-patch.html.xml"/>
		<xi:include href="./git-fsck.html.xml"/>
		<xi:include href="./git-fsck-objects.html.xml"/>
		<xi:include href="./git-gc.html.xml"/>
		<xi:include href="./git-get-tar-commit-id.html.xml"/>
		<xi:include href="./git-grep.html.xml"/>
		
		<xi:include href="./git-gui.html.xml"/>
		<xi:include href="./git-hash-object.html.xml"/>
		<xi:include href="./git-help.html.xml"/>
		<xi:include href="./git-http-fetch.html.xml"/>
		<xi:include href="./git-http-push.html.xml"/>
		<xi:include href="./git-imap-send.html.xml"/>
		<xi:include href="./git-index-pack.html.xml"/>
		<xi:include href="./git-init.html.xml"/>
		<xi:include href="./git-init-db.html.xml"/>
		<xi:include href="./git-instaweb.html.xml"/>
		<xi:include href="./git-log.html.xml"/>
		<xi:include href="./git-lost-found.html.xml"/>
		<xi:include href="./git-ls-files.html.xml"/>
		<xi:include href="./git-ls-remote.html.xml"/>
		<xi:include href="./git-ls-tree.html.xml"/>
		<xi:include href="./git-mailinfo.html.xml"/>
		<xi:include href="./git-mailsplit.html.xml"/>
		
		<xi:include href="./git-merge.html.xml"/>
		<xi:include href="./git-merge-base.html.xml"/>
		<xi:include href="./git-merge-file.html.xml"/>
		<xi:include href="./git-merge-index.html.xml"/>
		<xi:include href="./git-merge-one-file.html.xml"/>
		<xi:include href="./git-mergetool.html.xml"/>
		<xi:include href="./git-merge-tree.html.xml"/>
		<xi:include href="./git-mktag.html.xml"/>
		<xi:include href="./git-mktree.html.xml"/>
		<xi:include href="./git-mv.html.xml"/>
		
		<xi:include href="./git-name-rev.html.xml"/>
		<xi:include href="./git-notes.html.xml"/>
		<xi:include href="./git-pack-objects.html.xml"/>
		<xi:include href="./git-pack-redundant.html.xml"/>
		<xi:include href="./git-pack-refs.html.xml"/>
		<xi:include href="./git-parse-remote.html.xml"/>
		<xi:include href="./git-patch-id.html.xml"/>
		
		<xi:include href="./git-peek-remote.html.xml"/>
		<xi:include href="./git-prune.html.xml"/>
		<xi:include href="./git-prune-packed.html.xml"/>
		<xi:include href="./git-pull.html.xml"/>
		<xi:include href="./git-push.html.xml"/>
		<xi:include href="./git-quiltimport.html.xml"/>
		<xi:include href="./git-read-tree.html.xml"/>
		<xi:include href="./git-rebase.html.xml"/>
		<xi:include href="./git-receive-pack.html.xml"/>
		<xi:include href="./git-reflog.html.xml"/>
		<xi:include href="./git-relink.html.xml"/>
		<xi:include href="./git-remote.html.xml"/>
		<xi:include href="./git-repack.html.xml"/>
		<xi:include href="./git-repo-config.html.xml"/>
		<xi:include href="./git-request-pull.html.xml"/>
		
		<xi:include href="./git-rerere.html.xml"/>
		<xi:include href="./git-reset.html.xml"/>
	
		<xi:include href="./git-revert.html.xml"/>
		<xi:include href="./git-rev-list.html.xml"/>
		<xi:include href="./git-rev-parse.html.xml"/>
		<xi:include href="./git-rm.html.xml"/>
		<xi:include href="./git-send-email.html.xml"/>
		<xi:include href="./git-send-pack.html.xml"/>
		<xi:include href="./git-shell.html.xml"/>
		<xi:include href="./git-shortlog.html.xml"/>
		<xi:include href="./git-show.html.xml"/>
		<xi:include href="./git-show-branch.html.xml"/>
		<xi:include href="./git-show-index.html.xml"/>
		<xi:include href="./git-show-ref.html.xml"/>
		<xi:include href="./git-sh-setup.html.xml"/>
		<xi:include href="./git-stage.html.xml"/>
		<xi:include href="./git-stash.html.xml"/>
		<xi:include href="./git-status.html.xml"/>
		<xi:include href="./git-stripspace.html.xml"/>
	
		<xi:include href="./git-submodule.html.xml"/>
		<xi:include href="./git-svn.html.xml"/>
		<xi:include href="./git-symbolic-ref.html.xml"/>
		<xi:include href="./git-tag.html.xml"/>
		<xi:include href="./git-tar-tree.html.xml"/>
	
	
		<xi:include href="./git-unpack-file.html.xml"/>
		<xi:include href="./git-unpack-objects.html.xml"/>
		<xi:include href="./git-update-index.html.xml"/>
		<xi:include href="./git-update-ref.html.xml"/>
		<xi:include href="./git-update-server-info.html.xml"/>
		<xi:include href="./git-upload-archive.html.xml"/>
		<xi:include href="./git-upload-pack.html.xml"/>
	<!--
		<xi:include href="./git-var.html.xml"/>
		
		<xi:include href="./git-verify-pack.html.xml"/>
		<xi:include href="./git-verify-tag.html.xml"/>
		
		<xi:include href="./git-whatchanged.html.xml"/>
		<xi:include href="./git-write-tree.html.xml"/
	-->
 	</chapter>
 </part>
\ No newline at end of file
diff --git a/doc/source/en/TortoiseGit/tortoisegit.xml b/doc/source/en/TortoiseGit/tortoisegit.xml
index 6e2f5bb..7a69c14 100644
--- a/doc/source/en/TortoiseGit/tortoisegit.xml
+++ b/doc/source/en/TortoiseGit/tortoisegit.xml
@@ -38,7 +38,9 @@
 	<xi:include href="./tsvn_app_howto.xml"/>
 	<xi:include href="./tsvn_app_admins.xml" />
 	<xi:include href="./tsvn_app_automation.xml"/>	
+	<!--
 	<xi:include href="./tsvn_app_cli.xml"/>
+	-->
 	<xi:include href="./tsvn_app_internals.xml"/>
 	
 	<xi:include href="./tsvn_app_ssh.xml"/>