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

[<ki...@us...>]

Revision: 3709
          http://svn.sourceforge.net/winmerge/?rev=3709&view=rev
Author:   kimmov
Date:     2006-10-11 14:21:33 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc

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-10-11 21:18:37 UTC (rev 3708)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt	2006-10-11 21:21:33 UTC (rev 3709)
@@ -1,3 +1,7 @@
+2006-10-11 Kimmo
+ PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
+  Manual: Filters.xml
+
 2006-10-10 Kimmo
  PATCH: [ 1573933 ] Manual: Update introduction chapter
   Manual: Introduction.xml

Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml	2006-10-11 21:18:37 UTC (rev 3708)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml	2006-10-11 21:21:33 UTC (rev 3709)
@@ -110,7 +110,7 @@
           <para>User-defined folder. Selected in Options (<menuchoice>
               <guimenu>Edit</guimenu>
 
-              <guimenuitem>Options </guimenuitem>
+              <guimenuitem>Options</guimenuitem>
             </menuchoice><guilabel>&gt; System &gt;
           </guilabel><guilabel>Filter Folder)</guilabel>. By default it is
           <filename class="directory">My Documents</filename> -folder.</para>
@@ -292,9 +292,10 @@
     <example>
       <title>Line filter rule matching CVS "Id:" -lines:</title>
 
-      <para>Id-lines are like this:</para>
+      <para>Id-lines are like this (dollar-char not written so that version
+      control does not mess up that line):</para>
 
-      <screen>// $Id$</screen>
+      <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</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.