Skip to content

Commit

Permalink
Update mamual
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdottaka
sdottaka committed Dec 26, 2024
1 parent cd58158 commit 94d85d2
Show file tree
Hide file tree
Showing 4 changed files with 1,274 additions and 1,117 deletions.
161 changes: 86 additions & 75 deletions Docs/Manual/English/Configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@
</para>
</listitem>

<listitem>
<para>
<option>Close main window if there is on one MDI child window</option>: Pressing <keycap>Esc</keycap>
closes a child window, and if there is only one child window, it will also close the main window.
</para>
</listitem>

<listitem>
<para>
<option>Disabled</option>: Pressing <keycap>Esc</keycap> does
Expand Down Expand Up @@ -1234,8 +1241,8 @@

<section>
<title>
Automatically expand subfolders after comparison<indexterm>
<primary>expand subfolders</primary>
Include subfolders<indexterm>
<primary>include subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm>
Expand All @@ -1244,34 +1251,22 @@
<itemizedlist>
<listitem>
<para>
<option>Do not expand</option> (default): Subfolders remain collapsed after comparison.
</para>
</listitem>

<listitem>
<para>
<option>Expand all subfolders</option>: All subfolders are expanded after comparison.
</para>
</listitem>

<listitem>
<para>
<option>Expand different subfolders</option>: Only subfolders with differences are expanded after comparison.
<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders.
</para>
</listitem>

<listitem>
<para>
<option>Expand identical subfolders</option>: Only subfolders without differences are expanded after comparison.
<option>Disabled</option>: WinMerge only comparing the files in the root folder.
</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Include subfolders<indexterm>
<primary>include subfolders</primary>
Automatically expand subfolders after comparison<indexterm>
<primary>expand subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm>
Expand All @@ -1280,68 +1275,28 @@
<itemizedlist>
<listitem>
<para>
<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders.
<option>Do not expand</option> (default): Subfolders remain collapsed after comparison.
</para>
</listitem>

<listitem>
<para>
<option>Disabled</option>: WinMerge only comparing the files in the root folder.
<option>Expand all subfolders</option>: All subfolders are expanded after comparison.
</para>
</listitem>
</itemizedlist>
</section>

<section>
<title>
Automatically expand subfolders after comparison<indexterm>
<primary>expand subfolders</primary>

<secondary>detecting and ignoring differences</secondary>
</indexterm>
</title>

<variablelist>
<varlistentry>
<term>Do not expand</term>

<listitem>
<para>
(default): WinMerge will not automatically expand subfolders after comparing folders.
</para>
</listitem>
</varlistentry>

<varlistentry>
<term>Expand all subfolders</term>

<listitem>
<para>
WinMerge will automatically expand all subfolders after comparing folders.
</para>
</listitem>
</varlistentry>

<varlistentry>
<term>Expand different subfolders</term>

<listitem>
<para>
WinMerge will automatically expand different subfolders after comparing folders.
</para>
</listitem>
</varlistentry>

<varlistentry>
<term>Expand identical subfolders</term>
<listitem>
<para>
<option>Expand different subfolders</option>: Only subfolders with differences are expanded after comparison.
</para>
</listitem>

<listitem>
<para>
WinMerge will automatically expand identical subfolders after comparing folders.
</para>
</listitem>
</varlistentry>
</variablelist>
<listitem>
<para>
<option>Expand identical subfolders</option>: Only subfolders without differences are expanded after comparison.
</para>
</listitem>
</itemizedlist>
</section>

<section>
Expand Down Expand Up @@ -1557,29 +1512,85 @@
<primary>frhed</primary>
</indexterm>
</title>
<para>TBD</para>
<variablelist>
<varlistentry>
<term>View Settings...</term>

<listitem>
<para>TBD</para>
<para>Here you can choose:</para>
<itemizedlist>
<listitem>
<para>The number of bytes to display per line of hexdump (only applies
if &quot;Automatically adjust number of bytes per line&quot; is
disabled)</para>
</listitem>
<listitem>
<para>If the &quot;Automatically adjust number of bytes per line&quot;-
checkbox is checked, then the number of bytes displayed per hexdump
line is adjusted in such a way that the whole window width is used at
all times.</para>
</listitem>
<listitem>
<para>The number of digits for the offset length (only applies if
&quot;Adjust offset length&quot; is disabled)</para>
</listitem>
<listitem>
<para>If the offset length should be automatically adjusted to that of
the maximum offset (enabled) or right-padded with spaces (disabled)
</para>
</listitem>
<listitem>
<para>How to display the values at the caret position, either as signed
or as unsigned integer values</para>
</listitem>
<listitem>
<para>If read-only mode should be automatically set after opening
files.</para>
</listitem>
<listitem>
<para>The name of the text editor that will be called by the
<menuchoice><guimenu>Edit</guimenu><guimenuitem>Open in text editor
</guimenuitem></menuchoice> command.</para>
</listitem>
</itemizedlist>
</listitem>
</varlistentry>

<varlistentry>
<term>Binary Mode...</term>

<listitem>
<para>TBD</para>
<para>What kind of byte order to use: Either Little-endian, as used in
Intel-computers or Big-endian, used for example in computers with a
Motorola processor. The difference between these modes is thus: Consider a
longword, which is 4 bytes (named A to D) long.</para>

<screen>Longword in processor register = ABCD.</screen>

<para>The least significant bit, which has the value 1, is found in byte
"D". In a processor register the longword is ordered in this way. If this
value is written to a position in memory, then by Intel convention the
longword is written in this way, with the growing offsets to the right:
</para>

<screen>Longword in memory = DCBA.</screen>

<para>That is, the bytes making up the longword are written in reverse
order as they are found in a processor register.</para>

<para>This means that a file written by a Big-endian machine will contain
wrong longword and word values if read by a Little-endian machine without
conversion.</para>
</listitem>
</varlistentry>

<varlistentry>
<term>Character Set...</term>

<listitem>
<para>TBD</para>
<para>Here you can choose the character set for displaying and writing
characters, either ANSI (the Windows character set) or OEM (the DOS
character set). The font size in points can also be chosen.</para>
</listitem>
</varlistentry>
</variablelist>
Expand Down
Loading

0 comments on commit 94d85d2

Please sign in to comment.