Change Progress.h to SysProgress.h because there are two progress.h file.

[tortoisegit/TortoiseGitJp.git] / doc / source / en / TortoiseGit / tsvn_dug / dug_log.xml

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
index 9303877..13dd177 100644 (file)
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
@@ -34,8 +34,7 @@
                                        start of the log message.\r
                                </para>\r
                                <para>\r
-                                       Lines shown in blue indicate that something has been copied\r
-                                       to this development line (perhaps from a branch).\r
+                                       Lines shown in bold indicate that that is HEAD commit.\r
                                </para>\r
                        </listitem>\r
                        <listitem>\r
@@ -74,6 +73,7 @@
                                                From the property page\r
                                        </para>\r
                                </listitem>\r
+                               <!--\r
                                <listitem>\r
                                        <para>\r
                                                From the Progress dialog after an update\r
@@ -81,6 +81,7 @@
                                                which were changed since your last update\r
                                        </para>\r
                                </listitem>\r
+                               -->\r
                        </itemizedlist>\r
                </para>\r
        </sect2>\r
@@ -108,7 +109,7 @@
                </para>\r
                <para>\r
                        <graphic fileref="../images/ActionReplacedIcon.png"/>\r
-                       If a revision replaced a file or directory, the\r
+                       If a revision replaced(rename) a file, the\r
                        <emphasis>replaced</emphasis> icon is shown in the fourth column.\r
                </para>\r
        </sect2>\r
@@ -137,6 +138,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Compare and blame with working BASE</term>\r
                                        <listitem>\r
@@ -148,6 +150,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Show changes as unified diff</term>\r
                                        <listitem>\r
@@ -172,6 +175,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Compare and blame with previous revision</term>\r
                                        <listitem>\r
@@ -183,6 +187,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Save revision to...</term>\r
                                        <listitem>\r
@@ -192,6 +198,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Open / Open with...</term>\r
                                        <listitem>\r
@@ -209,6 +216,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Browse repository</term>\r
                                        <listitem>\r
@@ -218,31 +226,38 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
-                                       <term>Create branch/tag from revision</term>\r
+                                       <term>Create branch from revision</term>\r
                                        <listitem>\r
                                                <para>\r
-                                                       Create a branch or tag from a selected revision.\r
-                                                       This is useful e.g. if you forgot to create a tag and already\r
-                                                       committed some changes which weren't supposed to get into\r
-                                                       that release.\r
+                                                       Create a branch from a selected revision.\r
+                                                       This is useful e.g. \r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
                                <varlistentry>\r
-                                       <term>Update item to revision</term>\r
+                                       <term>Create tag from revision</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Create a tag from a selected revision.\r
+                                                       This is useful e.g. \r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+                               <varlistentry>\r
+                                       <term>Switch\Checkout to revision</term>\r
                                        <listitem>\r
                                                <para>\r
                                                        Update your working copy to the selected revision.\r
                                                        Useful if you want to have your working copy reflect\r
                                                        a time in the past, or if there have been further commits to\r
                                                        the repository and you want to update your working copy one\r
-                                                       step at a time. It is best to update a whole directory\r
-                                                       in your working copy, not just one file, otherwise your\r
-                                                       working copy could be inconsistent.\r
+                                                       step at a time. \r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Revert changes from this revision</term>\r
                                        <listitem>\r
@@ -260,6 +275,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Revert to this revision</term>\r
                                        <listitem>\r
@@ -277,6 +294,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Merge revision to...</term>\r
                                        <listitem>\r
@@ -292,6 +311,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Checkout...</term>\r
                                        <listitem>\r
@@ -302,6 +323,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Export...</term>\r
                                        <listitem>\r
@@ -312,6 +334,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Edit author / log message</term>\r
                                        <listitem>\r
@@ -322,6 +345,8 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Show revision properties</term>\r
                                        <listitem>\r
@@ -331,6 +356,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Copy to clipboard</term>\r
                                        <listitem>\r
@@ -371,14 +397,17 @@
                                                        difference tool. The default Diff-Tool is TortoiseMerge\r
                                                        which is supplied with TortoiseGit.\r
                                                </para>\r
+                                               <!--\r
                                                <para>\r
                                                        If you select this option for a folder, a further dialog pops\r
                                                        up listing the changed files and offering you further\r
                                                        diff options. Read more about the Compare Revisions\r
                                                        dialog in <xref linkend="tsvn-dug-compare-revs"/>.\r
                                                </para>\r
+                                               -->\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Blame revisions</term>\r
                                        <listitem>\r
@@ -389,6 +418,7 @@
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Show differences as unified diff</term>\r
                                        <listitem>\r
@@ -416,6 +446,7 @@
                                </varlistentry>\r
                        </variablelist>\r
                </para>\r
+               <!--\r
                <para>\r
                        If you select two or more revisions (using the usual\r
                        <keycap>Ctrl</keycap> or <keycap>Shift</keycap> modifiers),\r
@@ -423,6 +454,7 @@
                        which were made in the selected revisions. This is the easiest\r
                        way to rollback a group of revisions in one go.\r
                </para>\r
+               -->\r
                <para>\r
                        You can also choose to merge the selected revisions to another\r
                        working copy, as described above.\r