[Winmerge-svn] SF.net SVN: winmerge: [3877] branches/R2_6/Docs/Users/Manual

[<ge...@us...>]

Revision: 3877
          http://svn.sourceforge.net/winmerge/?rev=3877&view=rev
Author:   gerundt
Date:     2006-11-30 11:39:23 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
PATCH: [ 1605673 ] Manual: Minimal changes in Filters.xml

Modified Paths:
--------------
    branches/R2_6/Docs/Users/Manual/Changes.txt
    branches/R2_6/Docs/Users/Manual/Filters.xml

Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt	2006-11-30 19:38:06 UTC (rev 3876)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt	2006-11-30 19:39:23 UTC (rev 3877)
@@ -1,3 +1,7 @@
+2006-11-30 Tim
+ PATCH: [ 1605673 ] Manual: Minimal changes in Filters.xml
+  Manual: Filters.xml
+
 2006-11-29 Tim
  PATCH: [ 1604059 ] Manual: Add missing options to Configuration.xml
   Manual: Configuration.xml

Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml	2006-11-30 19:38:06 UTC (rev 3876)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml	2006-11-30 19:39:23 UTC (rev 3877)
@@ -27,8 +27,8 @@
           <term>Good site devoted for regexps:</term>
 
           <listitem>
-            <para><ulink
-            url="http://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></para>
+            <simpara><ulink
+            url="http://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></simpara>
           </listitem>
         </varlistentry>
 
@@ -36,8 +36,8 @@
           <term>Good HOWTO document for regexps:</term>
 
           <listitem>
-            <para><ulink
-            url="http://www.amk.ca/python/howto/regex/">http://www.amk.ca/python/howto/regex/</ulink></para>
+            <simpara><ulink
+            url="http://www.amk.ca/python/howto/regex/">http://www.amk.ca/python/howto/regex/</ulink></simpara>
           </listitem>
         </varlistentry>
 
@@ -45,8 +45,8 @@
           <term>Tutorial:</term>
 
           <listitem>
-            <para><ulink
-            url="http://www.zvon.org/other/PerlTutorial/Output/index.html">http://www.zvon.org/other/PerlTutorial/Output/index.html</ulink></para>
+            <simpara><ulink
+            url="http://www.zvon.org/other/PerlTutorial/Output/index.html">http://www.zvon.org/other/PerlTutorial/Output/index.html</ulink></simpara>
           </listitem>
         </varlistentry>
 
@@ -54,8 +54,8 @@
           <term>PDF quick reference:</term>
 
           <listitem>
-            <para><ulink
-            url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></para>
+            <simpara><ulink
+            url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></simpara>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -111,13 +111,10 @@
 
         <listitem>
           <para>User-defined folder. Selected in Options (<menuchoice>
-              <guimenu>Edit</guimenu>
-
-              <guimenuitem>Options</guimenuitem>
-            </menuchoice><guilabel>&gt; System &gt;
-          </guilabel><guilabel>Filter Folder)</guilabel>. By default it is
-          <filename class="directory">My Documents\WinMerge\Filters</filename>
-          -folder.</para>
+          <guimenu>Edit</guimenu><guimenuitem>Options</guimenuitem>
+          <guimenuitem>System</guimenuitem><guilabel>Filter Folder</guilabel>
+          </menuchoice>). By default it is <filename class="directory">
+          My Documents\WinMerge\Filters</filename> folder.</para>
         </listitem>
       </itemizedlist>
 
@@ -297,10 +294,9 @@
     <example>
       <title>Line filter rule matching CVS "Id:" -lines:</title>
 
-      <para>Id-lines are like this (dollar-char not written so that version
-      control does not mess up that line):</para>
+      <para>Id-lines are like this:</para>
 
-      <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</screen>
+      <screen>// &dollar;Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp &dollar;</screen>
 
       <para>And they can be filtered with rule:</para>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.