From: Denis Bradford Date: Mon, 26 Oct 2009 13:27:43 +0000 (+0000) Subject: Minor copy edit. X-Git-Tag: 2.16.5~2068 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=71c13215037449c3484291586e6ab0b6849180b9;p=winmerge-jp%2Fwinmerge-jp.git Minor copy edit. --- diff --git a/Docs/Users/Manual/tour/tour_comparingdirs.xml b/Docs/Users/Manual/tour/tour_comparingdirs.xml index beb06115e..719478607 100644 --- a/Docs/Users/Manual/tour/tour_comparingdirs.xml +++ b/Docs/Users/Manual/tour/tour_comparingdirs.xml @@ -54,7 +54,8 @@ The - + @@ -105,26 +106,23 @@
Comparing subfolders - So far we have looked at a non-recursive comparison, meaning that it - includes only files in the root target folders. It shows subfolders, but not - their contents. If you want to see the files in a subfolder, you have to - launch a new compare operation. For example, if double-click the - Common folder in the preceding comparison, WinMerge - opens a new File Compare window that compares the two - Common folders. + So far we have looked at a non-recursive comparison, which includes + files only in the root of the two folders you select, not any subfolders + that they contain. To compare their subfolders, you have to launch a new + compare operation. For example, in the preceding comparison, double-click + the Common folder icon to open a new File Compare + window that compares the two Common folders. - You can also compare folders recursively. A recursive comparison + WinMerge can also compare folders recursively. A recursive comparison includes all the files in all subfolders, so you don't need to launch - separate compare operations to navigate nested folders. You can As you might - expect, a recursive comparison can can take longer than a non-recursive - comparison for targets with a lot of nested files, and the result can be - harder to read. + separate compare operations to navigate nested folders. - To address these drawbacks, a handy alternative is to display the - results of recursive comparisons in a hierachical tree view, instead of the - default tabular view. In the tree view, subfolders are initially collapsed - for a compact, readable display, but you can expand them to see their - contents: + For targets with many nested folders and files, a recursive comparison + can can take longer than a non-recursive comparison, and the result can be + harder to read. In this case, consider displaying the results of recursive + comparisons in a hierachical tree view instead of the default tabular view. + Folders are initially collapsed for a compact, readable display — expand + just the ones whose contents you want to see: @@ -140,15 +138,14 @@
Merging folder differences - You merge differences in the Folder Compare window by copying one or - more files or folders from one side to the other, or by deleting - them. + Merging in the Folder Compare window involves either copying items + (files or folders) between folders, or deleting items. - For example, suppose you want to update files in two folders to the - most recent version. In the preceding screen shot, you can tell from the - asterisk that the left version of AboutDlg.h is more - recent. So, to merge AboutDlg.h select the row and - click the + For example, suppose you want to synchronize two folders. In the + preceding screen shot, you can tell from the asterisk that the left version + of AboutDlg.h is more recent. So, to merge + AboutDlg.h select the row and click the + @@ -169,4 +166,4 @@ displays the result in a new File Compare window, where you can see and merge the line-level differences.
- + \ No newline at end of file