|
From: <ge...@us...> - 2010-09-30 05:48:47
|
Revision: 7290
http://winmerge.svn.sourceforge.net/winmerge/?rev=7290&view=rev
Author: gerundt
Date: 2010-09-30 05:48:40 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
PATCH: [ 3078012 ] Drop text encoding note from manual
Modified Paths:
--------------
trunk/Docs/Users/Manual/Command_line.xml
trunk/Docs/Users/Manual/Compare_dirs.xml
trunk/Docs/Users/Manual/Compare_files.xml
trunk/Docs/Users/Manual/Install.xml
trunk/Docs/Users/Manual/WinMerge_help.xml
Removed Paths:
-------------
trunk/Docs/Users/Manual/Text_encoding.xml
Modified: trunk/Docs/Users/Manual/Command_line.xml
===================================================================
--- trunk/Docs/Users/Manual/Command_line.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Command_line.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -16,13 +16,13 @@
<para>Use one of these formats for the WinMerge command:</para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/?</option></arg>
</cmdsynopsis></para>
<para><cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="opt" rep="norepeat"><option>/r</option></arg>
@@ -68,36 +68,12 @@
</cmdsynopsis></para>
<cmdsynopsis sepchar=" ">
- <command>WinMerge<optional>U</optional></command>
+ <command>WinMergeU</command>
<arg choice="plain"
rep="norepeat"><replaceable>conflictfile</replaceable></arg>
</cmdsynopsis>
- <para>The command has two forms:</para>
-
- <variablelist>
- <varlistentry>
- <term>WinMergeU</term>
-
- <listitem>
- <para>Use <command>WinMergeU</command> if you are running the Unicode
- version of WinMerge, typically installed on recent Windows
- systems.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>WinMerge</term>
-
- <listitem>
- <para>Use <command>WinMerge</command> only if you are running the ANSI
- version of WinMerge, typically installed only on Windows
- 9<replaceable>x</replaceable> and WME systems.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
<para>Entering the command with no parameters or pathnames simply opens the
WinMerge window. Parameters are prefixed with either a forward slash (
<literal>/</literal> ) or dash ( <literal>-</literal> ) character. Pathnames
Modified: trunk/Docs/Users/Manual/Compare_dirs.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_dirs.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Compare_dirs.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -7,9 +7,6 @@
<para>This topic describes how to compare and merge folders using the Folder
Compare window.</para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_dirs_starting">
<title>Starting a folder compare operation</title>
Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Compare_files.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -12,9 +12,6 @@
first. See <xref linkend="Intro_diffs" /> for related information about hex
files. </para>
- <xi:include href="Text_encoding.xml"
- xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<section id="Compare_files_starting">
<title>Starting a file compare operation</title>
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Install.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -33,7 +33,7 @@
<note>
<para>The installer requires Administrator user privileges in Windows
- NT4/2000/XP. If you don't have admin user privileges, you can install
+ 2000 or newer. If you don't have admin user privileges, you can install
WinMerge by unzipping from an archive file (see <xref
linkend="InstallFromArchive" />).</para>
</note>
@@ -82,9 +82,7 @@
</indexterm></term>
<listitem>
- <para>WinMerge executable (<filename>WinMerge.exe</filename> on
- Windows 9X and WME; <filename>WinMergeU.exe</filename> on all
- other Windows versions), Help, and other needed files. Cannot be
+ <para>WinMerge executable, Help, and other needed files. Cannot be
unchecked.</para>
</listitem>
</varlistentry>
Deleted: trunk/Docs/Users/Manual/Text_encoding.xml
===================================================================
--- trunk/Docs/Users/Manual/Text_encoding.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/Text_encoding.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"build/dtd/docbookx.dtd">
-<note>
- <title>Important note for ANSI WinMerge users</title>
-
- <para>In the ANSI version of WinMerge (WinMerge.exe) that is typically
- installed on older versions of windows, comparisons are set by default to use
- the default Windows ANSI codepages on your system - for example, Windows-1252
- on many Western European systems). If the files you are comparing all use this
- format, the default settings are fine.</para>
-
- <para>However, if you plan to compare files with different encodings (for
- example, UTF or another Windows codepage), you might need to change the
- default codepage settings, as described in <xref
- linkend="Configuration_codepage" />. If you are running the Unicode version of
- WinMerge (WinMergeU.exe), comparisons handle different encodings
- transparently, and so codepage settings do not affect you.</para>
-</note>
\ No newline at end of file
Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml 2010-09-29 07:39:45 UTC (rev 7289)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml 2010-09-30 05:48:40 UTC (rev 7290)
@@ -85,9 +85,12 @@
</authorgroup>
</bookinfo>
- <!--Note to maintainers: Not all doc files are included in this file. There are also fragment files included at the topic
-level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml
-and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
+ <!-- Note to maintainers:
+ Not all doc files are included in this file. There are also fragment files
+ included at the topic level. For example, several files include elements from
+ replaceables.xml. Other fragment file is select-unpacker.xml.
+ Please do not delete xml files in this directory unless you know for sure
+ that they are not used. -->
&About_Doc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
