[meld] Use 'change' instead of 'chunk' as a more understandable term



commit b22d0c173d75055752ee0d11b82194963d78e7dd
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jun 2 14:09:50 2012 +1000

    Use 'change' instead of 'chunk' as a more understandable term

 help/C/file-changes.page |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/help/C/file-changes.page b/help/C/file-changes.page
index d8587ef..bcfd898 100644
--- a/help/C/file-changes.page
+++ b/help/C/file-changes.page
@@ -27,7 +27,7 @@ You can navigate between changes with the
 <guiseq><gui style="menu">Changes</gui><gui style="menuitem">Previous change</gui></guiseq>
 and
 <guiseq><gui style="menu">Changes</gui><gui style="menuitem">Next change</gui></guiseq>
-menu items. You can also use your mouse's scroll wheel to move between chunks,
+menu items. You can also use your mouse's scroll wheel to move between changes,
 by scrolling on the central change bar.
 </p>
 
@@ -39,21 +39,21 @@ by scrolling on the central change bar.
 <title>Changing changes</title>
 
 <p>
-In addition to directly editing text files, <app>Meld</app> gives you tools to move, copy or delete individual differences between files. The bar between two files not only shows you what parts of the two files correspond, but also lets you selectively merge or delete differing chunks by clicking the arrow or cross icons next to the start of each chunk.
+In addition to directly editing text files, <app>Meld</app> gives you tools to move, copy or delete individual differences between files. The bar between two files not only shows you what parts of the two files correspond, but also lets you selectively merge or delete differing changes by clicking the arrow or cross icons next to the start of each change.
 </p>
 
 <p>
-The default action is <em>replace</em>. This action replaces the contents of the corresponding chunk with the current chunk.
+The default action is <em>replace</em>. This action replaces the contents of the corresponding change with the current change.
 </p>
 <comment>
   <cite date="2010-02-25" href="mailto:kai willadsen gmail com">Kai</cite>
   <p>It would be nice to have small video clips inlined that demonstrated exactly what each action did.</p>
 </comment>
 <p>
-Hold down the <key>Shift</key> key to change the current action to <em>delete</em>. This action deletes the current chunk.
+Hold down the <key>Shift</key> key to change the current action to <em>delete</em>. This action deletes the current change.
 </p>
 <p>
-Hold down the <key>Ctrl</key> key to change the current action to <em>insert</em>. This action inserts the current chunk above or below (as selected) the corresponding chunk.
+Hold down the <key>Ctrl</key> key to change the current action to <em>insert</em>. This action inserts the current change above or below (as selected) the corresponding change.
 </p>
 
 </section>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]