PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark

diff --git a/Docs/Users/Manual/Changes.txt b/Docs/Users/Manual/Changes.txt
index 913bf07..9a757f5 100644 (file)
--- a/Docs/Users/Manual/Changes.txt
+++ b/Docs/Users/Manual/Changes.txt
@@ -1,3 +1,7 @@
+2006-11-22 Kimmo
+ PATCH: [ 1600651 ] Manual: clarify folder filter rules about starting mark
+  Manual: Filters.xml
+
 2006-11-21 Tim
  PATCH: [ 1398013 ] Add availability of binary viewing/merging to FAQ
   Manual: Faq.xml

diff --git a/Docs/Users/Manual/Filters.xml b/Docs/Users/Manual/Filters.xml
index 8f94cf9..db2d188 100644 (file)
--- a/Docs/Users/Manual/Filters.xml
+++ b/Docs/Users/Manual/Filters.xml
@@ -145,7 +145,7 @@ def: include</screen>where <constant>def</constant>: is:<itemizedlist>
       filter must contain rule to include all wanted subfolders. Usually its
       wise to use this rule to include all subfolders:</para>
 
-      <screen>d: \\*$ ## Subdirectories</screen>
+      <screen>d: \\*$ ## Subfolders</screen>
 
       <para>There can be one filter rule in one line. And rule cannot be split
       to several lines. Common format for one filter line is like this:</para>
@@ -154,15 +154,16 @@ def: include</screen>where <constant>def</constant>: is:<itemizedlist>
 
       <para>or</para>
 
-      <screen>d: \\directory$ ## Match given directory name</screen>
+      <screen>d: \\folder$ ## Match given folder name</screen>
 
       <para>Rule begins with "<constant>f:</constant>" if it matches for
       filenames and "<constant>d:</constant>" if it matches for folder names.
-      (d comes from "directory".) Filenames are given to filter as is, there
-      are no special characters added. But for folder names there must be
-      "<constant>\\</constant>" in begin of folder name. This is done clearly
-      to separate folder names and filenames. "<constant>##</constant>" is a
-      comment separator, all characters in line after that are ignored by
+      (d comes from "folder".) Filenames are given to filter as is, there are
+      no special characters added. But for folder names there must be
+      "<constant>\\</constant>" in begin of folder name. The resulting "\"
+      char is a part of the folder name. This is done clearly to separate
+      folder names and filenames. "<constant>##</constant>" is a comment
+      separator, all characters in line after that are ignored by
       WinMerge.</para>
 
       <para><note>
@@ -181,7 +182,8 @@ def: include</screen>where <constant>def</constant>: is:<itemizedlist>
 f: \.h$ ## Match *.h files
 f: ^My ## Match My*.* files
 f: Dlg\. ## Match *Dlg.* files
-d: \\test$ ## Match 'test' directories</screen>
+d: \\test$ ## Match 'test' folders
+d: ^\\Build$ ## Match 'Build' folders</screen>
       </example>
 
       <para>Line begin or -end marker (<constant>"^"</constant> or
@@ -314,4 +316,4 @@ f: ^[h,k,m] ## h*.* &amp; k*.* &amp; m*.* files</screen>
       <screen>^#</screen>
     </example>
   </sect2>
-</sect1>
+</sect1>
\ No newline at end of file