From 79f086610954a0c4c2d378b38511a8f88c0faf8c Mon Sep 17 00:00:00 2001
From: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Date: Wed, 3 Dec 2014 19:10:53 +0800
Subject: [PATCH] Update doc for "Changing case in a filename"

The issue #830 has supported "git mv foo.txt Foo.txt --force",
so the document needs to be updated too.

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 doc/source/en/TortoiseGit/tgit_dug/dug_rename.xml | 65 ++---------------------
 1 file changed, 5 insertions(+), 60 deletions(-)

diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_rename.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_rename.xml
index a16f70214..e8790dea9 100644
--- a/doc/source/en/TortoiseGit/tgit_dug/dug_rename.xml
+++ b/doc/source/en/TortoiseGit/tgit_dug/dug_rename.xml
@@ -152,7 +152,6 @@
 			</para>
 		</caution>
 	</sect2>
-	<!--
 	<sect2 id="tgit-dug-renameincase">
 		<title>Changing case in a filename</title>
 		<indexterm>
@@ -160,67 +159,13 @@
 		</indexterm>
 		<?dbhh topicname="HIDD_RENAMEINCASE"?>
 		<para>
-			Making case-only changes to a filename is tricky with Git
-			on Windows, because for a short time during a rename, both filenames
-			have to exist. As Windows has a case-insensitive file system,
-			this does not work using the usual Rename command.
-		</para>
-		<para>
-			Fortunately there are (at least) two possible methods to rename a file 
-			without losing its log history. It is important to rename it 
-			within Git. Just renaming in the explorer will corrupt 
-			your working tree!
-		</para>
-		<para>
-			Solution A) (recommended)
-			<orderedlist>
-				<listitem>
-					<para>
-						Commit the changes in your working tree.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Rename the file from UPPERcase to upperCASE directly 
-						in the repository using the repository browser.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Update your working tree.
-					</para>
-				</listitem>
-			</orderedlist>
-		</para>
-
-		<para>
-			Solution B)
-			<orderedlist>
-				<listitem>
-					<para>
-						Rename from UPPERcase to UPPERcase_ with the rename command
-						in the TortoiseGit submenu.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Commit the changes.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Rename from UPPERcase_ to upperCASE.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						Commit the changes.
-					</para>
-				</listitem>
-			</orderedlist>
+			Making case-only changes to a filename needs special attention,
+			because Windows has a case-insensitive file system.
+			Therefore just renaming a file using the rename command of the Explorer is likely not to work.
+			It is important to rename it using Git in order to update the index to make it use the new filename.
+			Use the <guimenuitem>Rename...</guimenuitem> command in the TortoiseGit submenu.
 		</para>
 	</sect2>
-	-->
 	<!--
 	<sect2 id="tgit-dug-rename-case-conflict">
 		<title>Dealing with filename case conflicts</title>
-- 
2.11.4.GIT