Finish Add Git Document to help file

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

diff --git a/doc/doc.build b/doc/doc.build
index cbe8285..12b6dc2 100644 (file)
--- a/doc/doc.build
+++ b/doc/doc.build
@@ -467,11 +467,13 @@ All user/site specific configuration is stored in doc.build.user.
 \r
                        <copy file="${doc.target.work}/htmlhelp.chm" tofile="${file.target}"/>\r
                </if>\r
+               <!--\r
                <delete>\r
                        <fileset>\r
                                <include name="${doc.target.work}/*.*"/>\r
                        </fileset>\r
                </delete>\r
+               -->\r
        </target>\r
 \r
 <!-- ====================================================================== -->\r

diff --git a/doc/doc.build.include b/doc/doc.build.include
index 0813056..70fe2e7 100644 (file)
--- a/doc/doc.build.include
+++ b/doc/doc.build.include
@@ -30,15 +30,19 @@ This will only build the english HTML help file for TortoiseGit
        <!-- the documentation will be created by default                 -->\r
 \r
        <property name="applications" \r
-               value="TortoiseGit,TortoiseMerge" \r
+               value="TortoiseGit" \r
                unless="${property::exists('applications')}"\r
        />\r
+       \r
+       <!-- pdf,chm,html,htmlsingle -->\r
        <property name="docformats" \r
-               value="pdf,chm,html,htmlsingle" \r
+               value="chm" \r
                unless="${property::exists('docformats')}"\r
        />\r
+       \r
+       <!--,de,es,fa,fi,fr,hr,id,ja,nl,ru,sl,sk,sr_spc,sr_spl,zh_CN" -->\r
        <property name="languages" \r
-               value="en,de,es,fa,fi,fr,hr,id,ja,nl,ru,sl,sk,sr_spc,sr_spl,zh_CN" \r
+               value="en"\r
                unless="${property::exists('languages')}"\r
        />\r
 \r
@@ -84,7 +88,14 @@ This will only build the english HTML help file for TortoiseGit
                />\r
                <property name="help.resource" value="${help.resource.TortoiseMerge}" />\r
        </target>\r
-       \r
+       <target name="help.prepare.Git">\r
+       <echo message="help.prepare.Git"/>\r
+               <property name="help.resource.TortoiseGit"\r
+                 value="../src/TortoiseProc/resource.h"\r
+                       unless="${property::exists('help.resource.TortoiseGit')}"\r
+               />\r
+               <property name="help.resource" value="${help.resource.TortoiseGit}" />\r
+       </target>\r
        <!-- Fileset to exclude from translation and .pot creation        -->\r
        <!-- Duplicate these files in the "sourcefiles" fileset           -->\r
 <!--\r

diff --git a/doc/source/en/TortoiseGit/git_doc/everyday.xml b/doc/source/en/TortoiseGit/git_doc/everyday.xml
index d36bc2e..d511568 100644 (file)
--- a/doc/source/en/TortoiseGit/git_doc/everyday.xml
+++ b/doc/source/en/TortoiseGit/git_doc/everyday.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\r
 \r
-<article lang="en" id="Everyday GIT With 20 Commands Or So">\r
+<article lang="en" id="Everyday">\r
 <articleinfo>\r
-    <title>Everyday GIT With 20 Commands Or So</title>\r
+    <title>Everyday</title>\r
         <indexterm>\r
-                <primary>Everyday GIT With 20 Commands Or So</primary>\r
+                <primary>Everyday</primary>\r
         </indexterm>\r
 </articleinfo>\r
 <simpara><xref linkend="Basic Repository"/> commands are needed by people who have a\r

diff --git a/doc/source/en/TortoiseGit/git_doc/git-doc.xml b/doc/source/en/TortoiseGit/git_doc/git-doc.xml
index fbaf179..c1bb166 100644 (file)
--- a/doc/source/en/TortoiseGit/git_doc/git-doc.xml
+++ b/doc/source/en/TortoiseGit/git_doc/git-doc.xml
@@ -6,10 +6,13 @@
                <title>Git User Manual</title>\r
                <xi:include href="./user-manual.xml"/>\r
        </chapter>\r
-       \r
+       <chapter id="Git-Tutuial"  xmlns:xi="http://www.w3.org/2001/XInclude">\r         <title>Git Tuturial</title>\r            \r               <xi:include href="./gittutorial.html.xml"/>\r            <xi:include href="./gittutorial-2.html.xml"/>\r          <xi:include href="./gitcore-tutorial.html.xml"/>\r
+               <xi:include href="./gitcvs-migration.html.xml"/>                \r
+               <xi:include href="./everyday.xml"/>\r
+               \r       </chapter>\r
        <chapter id="git-command" xmlns:xi="http://www.w3.org/2001/XInclude">\r
                <title>Git Command Reference</title>\r           <xi:include href="./git.html.xml"/>\r            <xi:include href="./git-add.html.xml"/>\r
                <xi:include href="./git-am.html.xml"/>\r         <xi:include href="./git-annotate.html.xml"/>\r
                <xi:include href="./git-apply.html.xml"/>\r              <xi:include href="./git-archimport.html.xml"/>\r         <xi:include href="./git-archive.html.xml"/>\r            \r               <xi:include href="./git-bisect.html.xml"/>\r             <xi:include href="./git-blame.html.xml"/>\r              <xi:include href="./git-branch.html.xml"/>\r             <xi:include href="./git-bundle.html.xml"/>\r             \r               <xi:include href="./git-cat-file.html.xml"/>\r           <xi:include href="./git-check-attr.html.xml"/>\r         <xi:include href="./git-checkout.html.xml"/>\r           <xi:include href="./git-checkout-index.html.xml"/>\r             <xi:include href="./git-check-ref-format.html.xml"/>\r           <xi:include href="./git-cherry.html.xml"/>\r             <xi:include href="./git-cherry-pick.html.xml"/>\r                <xi:include href="./git-citool.html.xml"/>\r             <xi:include href="./git-clean.html.xml"/>\r              <xi:include href="./git-clone.html.xml"/>\r              <xi:include href="./git-commit.html.xml"/>\r             <xi:include href="./git-commit-tree.html.xml"/>\r                <xi:include href="./git-config.html.xml"/>\r             <xi:include href="./git-count-objects.html.xml"/>\r              <xi:include href="./git-cvsexportcommit.html.xml"/>\r            <xi:include href="./git-cvsimport.html.xml"/>\r          <xi:include href="./git-cvsserver.html.xml"/>\r          \r               <xi:include href="./git-daemon.html.xml"/>\r             <xi:include href="./git-describe.html.xml"/>\r           \r               <xi:include href="./git-diff.html.xml"/>\r               <xi:include href="./git-diff-files.html.xml"/>\r         <xi:include href="./git-diff-index.html.xml"/>\r         <xi:include href="./git-diff-tree.html.xml"/>\r          <xi:include href="./git-fast-export.html.xml"/>\r                <xi:include href="./git-fast-import.html.xml"/>\r                <xi:include href="./git-fetch.html.xml"/>\r              <xi:include href="./git-fetch-pack.html.xml"/>\r         <xi:include href="./git-filter-branch.html.xml"/>\r              <xi:include href="./git-fmt-merge-msg.html.xml"/>\r              <xi:include href="./git-for-each-ref.html.xml"/>\r               <xi:include href="./git-format-patch.html.xml"/>\r               <xi:include href="./git-fsck.html.xml"/>\r               <xi:include href="./git-fsck-objects.html.xml"/>\r               <xi:include href="./git-gc.html.xml"/>\r         <xi:include href="./git-get-tar-commit-id.html.xml"/>\r          <xi:include href="./git-grep.html.xml"/>\r               \r               <xi:include href="./git-gui.html.xml"/>\r                <xi:include href="./git-hash-object.html.xml"/>\r                <xi:include href="./git-help.html.xml"/>\r               <xi:include href="./git-http-fetch.html.xml"/>\r         <xi:include href="./git-http-push.html.xml"/>\r          <xi:include href="./git-imap-send.html.xml"/>\r          <xi:include href="./git-index-pack.html.xml"/>\r         <xi:include href="./git-init.html.xml"/>\r               <xi:include href="./git-init-db.html.xml"/>\r            <xi:include href="./git-instaweb.html.xml"/>\r           <xi:include href="./git-log.html.xml"/>\r                <xi:include href="./git-lost-found.html.xml"/>\r         <xi:include href="./git-ls-files.html.xml"/>\r           <xi:include href="./git-ls-remote.html.xml"/>\r          <xi:include href="./git-ls-tree.html.xml"/>\r            <xi:include href="./git-mailinfo.html.xml"/>\r           <xi:include href="./git-mailsplit.html.xml"/>\r          \r               <xi:include href="./git-merge.html.xml"/>\r              <xi:include href="./git-merge-base.html.xml"/>\r         <xi:include href="./git-merge-file.html.xml"/>\r         <xi:include href="./git-merge-index.html.xml"/>\r                <xi:include href="./git-merge-one-file.html.xml"/>\r             <xi:include href="./git-mergetool.html.xml"/>\r          <xi:include href="./git-merge-tree.html.xml"/>\r         <xi:include href="./git-mktag.html.xml"/>\r              <xi:include href="./git-mktree.html.xml"/>\r             <xi:include href="./git-mv.html.xml"/>\r         \r               <xi:include href="./git-name-rev.html.xml"/>\r           <xi:include href="./git-notes.html.xml"/>\r              <xi:include href="./git-pack-objects.html.xml"/>\r               <xi:include href="./git-pack-redundant.html.xml"/>\r             <xi:include href="./git-pack-refs.html.xml"/>\r          <xi:include href="./git-parse-remote.html.xml"/>\r               <xi:include href="./git-patch-id.html.xml"/>\r           \r               <xi:include href="./git-peek-remote.html.xml"/>\r                <xi:include href="./git-prune.html.xml"/>\r              <xi:include href="./git-prune-packed.html.xml"/>\r               <xi:include href="./git-pull.html.xml"/>\r               <xi:include href="./git-push.html.xml"/>\r               <xi:include href="./git-quiltimport.html.xml"/>\r                <xi:include href="./git-read-tree.html.xml"/>\r          <xi:include href="./git-rebase.html.xml"/>\r             <xi:include href="./git-receive-pack.html.xml"/>\r               <xi:include href="./git-reflog.html.xml"/>\r             <xi:include href="./git-relink.html.xml"/>\r             <xi:include href="./git-remote.html.xml"/>\r             <xi:include href="./git-repack.html.xml"/>\r             <xi:include href="./git-repo-config.html.xml"/>\r                <xi:include href="./git-request-pull.html.xml"/>\r               \r               <xi:include href="./git-rerere.html.xml"/>\r             <xi:include href="./git-reset.html.xml"/>\r      \r               <xi:include href="./git-revert.html.xml"/>\r             <xi:include href="./git-rev-list.html.xml"/>\r           <xi:include href="./git-rev-parse.html.xml"/>\r          <xi:include href="./git-rm.html.xml"/>\r         <xi:include href="./git-send-email.html.xml"/>\r         <xi:include href="./git-send-pack.html.xml"/>\r          <xi:include href="./git-shell.html.xml"/>\r              <xi:include href="./git-shortlog.html.xml"/>\r           <xi:include href="./git-show.html.xml"/>\r               <xi:include href="./git-show-branch.html.xml"/>\r                <xi:include href="./git-show-index.html.xml"/>\r         <xi:include href="./git-show-ref.html.xml"/>\r           <xi:include href="./git-sh-setup.html.xml"/>\r           <xi:include href="./git-stage.html.xml"/>\r              <xi:include href="./git-stash.html.xml"/>\r              <xi:include href="./git-status.html.xml"/>\r             <xi:include href="./git-stripspace.html.xml"/>\r \r               <xi:include href="./git-submodule.html.xml"/>\r          <xi:include href="./git-svn.html.xml"/>\r                <xi:include href="./git-symbolic-ref.html.xml"/>\r               <xi:include href="./git-tag.html.xml"/>\r                <xi:include href="./git-tar-tree.html.xml"/>\r   \r       \r               <xi:include href="./git-unpack-file.html.xml"/>\r                <xi:include href="./git-unpack-objects.html.xml"/>\r             <xi:include href="./git-update-index.html.xml"/>\r               <xi:include href="./git-update-ref.html.xml"/>\r         <xi:include href="./git-update-server-info.html.xml"/>\r         <xi:include href="./git-upload-archive.html.xml"/>\r             <xi:include href="./git-upload-pack.html.xml"/>\r                        \r               <xi:include href="./git-var.html.xml"/>\r        \r\r              <xi:include href="./git-verify-pack.html.xml"/>\r                <xi:include href="./git-verify-tag.html.xml"/>\r         \r               <xi:include href="./git-whatchanged.html.xml"/>\r                \r               <xi:include href="./git-write-tree.html.xml"/>\r \r
-       </chapter>\r
+       </chapter>\r     <chapter id="git-misc" xmlns:xi="http://www.w3.org/2001/XInclude">\r             <title>Misc</title>\r            <xi:include href="./gitcli.html.xml"/>\r         <xi:include href="./gitattributes.html.xml"/>\r          <xi:include href="./gitignore.html.xml"/>\r              <xi:include href="./githooks.html.xml"/>\r               <xi:include href="./gitk.html.xml"/>\r           <xi:include href="./gitmodules.html.xml"/>\r             <xi:include href="./gitrepository-layout.html.xml"/>\r           <xi:include href="./gitworkflows.html.xml"/>\r           <xi:include href="./gitglossary.html.xml"/>\r    </chapter>\r
 </part>
\ No newline at end of file

diff --git a/doc/source/styles_chm.css b/doc/source/styles_chm.css
index d9d3e15..6738102 100644 (file)
--- a/doc/source/styles_chm.css
+++ b/doc/source/styles_chm.css
@@ -257,4 +257,19 @@ div.table td {
 {\r
 font-family: arial,helvetica,sans-serif;\r
 font-style: italic;\r
+}\r
+\r
+div.literallayout p {\r
+  padding: 0em;\r
+  margin: 0em;\r
+}\r
+\r
+div.literallayout {\r
+  font-family: monospace;\r
+#  margin: 0.5em 10% 0.5em 1em;\r
+  margin: 0em;\r
+  color: navy;\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
 }
\ No newline at end of file