PATCH: [ 1927597 ] Manual: Change EOL names

diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml
index afc6337..41c9991 100644 (file)
--- a/Docs/Users/Manual/Compare_files.xml
+++ b/Docs/Users/Manual/Compare_files.xml
@@ -112,7 +112,7 @@
 
     <para>Next two panes show <guilabel>RO</guilabel> if file is protected and
     file's EOL style
-    ("<guilabel>DOS</guilabel>/<guilabel>UNIX</guilabel>/<guilabel>MAC</guilabel>").
+    ("<guilabel>Windows</guilabel>/<guilabel>Unix</guilabel>/<guilabel>Mac</guilabel>").
     Note these two different ways to show EOL style. When per-line EOL style
     is not remembered, EOL style is shown on own pane in statusbar. And when
     per-line EOL style is remembered line's EOL style is shown after char
@@ -383,7 +383,7 @@
     tabulators, line ends). This is very useful for example when there are
     spaces in other file and tabulators in other. Also, if <guilabel>Preserve
     original EOL chars</guilabel> is enabled, WinMerge shows type of EOL
-    (<guilabel>DOS</guilabel>/<guilabel>UNIX</guilabel>/<guilabel>MAC</guilabel>).</para>
+    (<guilabel>Windows</guilabel>/<guilabel>Unix</guilabel>/<guilabel>Mac</guilabel>).</para>
   </sect2>
 
   <sect2>

diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml
index 69b4286..27dd815 100644 (file)
--- a/Docs/Users/Manual/Configuration.xml
+++ b/Docs/Users/Manual/Configuration.xml
@@ -219,11 +219,11 @@
     </sect3>
 
     <sect3>
-      <title>Ignore carriage return differences (DOS/UNIX/MAC)</title>
+      <title>Ignore carriage return differences (Windows/Unix/Mac)</title>
 
       <para>If this option is not set WinMerge does not detect EOL style
       differences as differences. If two lines differ only by EOL characters
-      (e.g. DOS EOL and Unix EOL) WinMerge detects files as identical.</para>
+      (e.g. Windows EOL and Unix EOL) WinMerge detects files as identical.</para>
     </sect3>
 
     <sect3>
@@ -390,20 +390,20 @@ EOL differences.</screen>
 454F 4C20 6469 6666 6572 656E 6365 732E</screen>
 
       <para>The example presents one simple text file with five lines of text.
-      All lines, except third, are terminated with DOS style EOL (0D0A). Third
+      All lines, except third, are terminated with Windows style EOL (0D0A). Third
       line has Unix style EOL (0D).</para>
 
       <para>If <guilabel>Preserve original EOL chars</guilabel>-option is not
-      set WinMerge determines file is meant to be DOS style file and converts
+      set WinMerge determines file is meant to be Windows style file and converts
       third line's last bytes to 0D0A before comparing. Missing EOL char is
       usually an error in file, so WinMerge is smart and fixes this error
       instead of reporting it as a difference. That's right, WinMerge changes
       user's file without telling about it to user. WinMerge also shows files
-      EOL style as <guilabel>DOS</guilabel> in filecompare statusbar.</para>
+      EOL style as <guilabel>Windows</guilabel> in filecompare statusbar.</para>
 
       <para>Advanced user might want to handle files without this automatic
       fixing, file might be handled in systems with different EOL styles (e.g.
-      Windows and Linux). In that case, user can set this option and see
+      Windows and Unix). In that case, user can set this option and see
       WinMerge showing EOL style for every line.</para>
     </sect3>
 

diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml
index 3db0a7a..b2810d2 100644 (file)
--- a/Docs/Users/Manual/Faq.xml
+++ b/Docs/Users/Manual/Faq.xml
@@ -234,8 +234,8 @@
         </question>
 
         <answer>
-          <para>Maybe your files have different line-ending styles (e.g. DOS
-          and UNIX?). WinMerge by default compares also line-ending styles,
+          <para>Maybe your files have different line-ending styles (e.g. Windows
+          and Unix?). WinMerge by default compares also line-ending styles,
           but you can disable it from <menuchoice>
               <guimenu>Edit</guimenu>