Skip to content

Commit c093d87

Browse files
vlakoffvlakoff
authored
Update documentation for "Include unique subfolders contents" setting (#2396)
* Update default value of "Include unique subfolders contents" setting Since WinMerge 2.16.8, this setting is enabled by default. * Match position of "Include unique subfolders contents" setting in the program 1. "Include unique subfolders contents" has been moved below "Include subfolders". 2. Later, "Automatically expand subfolders after comparison" dropdown has been implemented, immediately below "Include subfolders". * Move default checkbox state to the top of the list For documentation consistency. It seems to be the ordering convention elsewhere.
1 parent 3ec2938 commit c093d87

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

‎Docs/Manual/English/Configuration.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -981,17 +981,17 @@
981981
<itemizedlist>
982982
<listitem>
983983
<para>
984-
<option>Enabled</option>:
985-
Makes the color of the different lines ignored by line filters and substitution
986-
filters the same as the color of the identical lines.
984+
<option>Disabled</option> (default):
985+
Difference lines ignored by line filters and substitution filters are
986+
displayed in the color of Ignored Difference.
987987
</para>
988988
</listitem>
989989

990990
<listitem>
991991
<para>
992-
<option>Disabled</option> (default):
993-
Difference lines ignored by line filters and substitution filters are
994-
displayed in the color of Ignored Difference.
992+
<option>Enabled</option>:
993+
Makes the color of the different lines ignored by line filters and substitution
994+
filters the same as the color of the identical lines.
995995
</para>
996996
</listitem>
997997
</itemizedlist>
@@ -1245,30 +1245,6 @@
12451245
</itemizedlist>
12461246
</section>
12471247

1248-
<section>
1249-
<title>
1250-
Include unique subfolders contents<indexterm>
1251-
<primary>include unique subfolders</primary>
1252-
1253-
<secondary>detecting and ignoring differences</secondary>
1254-
</indexterm>
1255-
</title>
1256-
1257-
<itemizedlist>
1258-
<listitem>
1259-
<para>
1260-
<option>Disabled</option> (default): WinMerge ignore unique subfolders when comparing folders.
1261-
</para>
1262-
</listitem>
1263-
1264-
<listitem>
1265-
<para>
1266-
<option>Enabled</option>: WinMerge also shows the content from unique subfolders.
1267-
</para>
1268-
</listitem>
1269-
</itemizedlist>
1270-
</section>
1271-
12721248
<section>
12731249
<title>
12741250
Include subfolders<indexterm>
@@ -1345,6 +1321,30 @@
13451321
</variablelist>
13461322
</section>
13471323

1324+
<section>
1325+
<title>
1326+
Include unique subfolders contents<indexterm>
1327+
<primary>include unique subfolders</primary>
1328+
1329+
<secondary>detecting and ignoring differences</secondary>
1330+
</indexterm>
1331+
</title>
1332+
1333+
<itemizedlist>
1334+
<listitem>
1335+
<para>
1336+
<option>Enabled</option> (default): WinMerge also shows the content from unique subfolders.
1337+
</para>
1338+
</listitem>
1339+
1340+
<listitem>
1341+
<para>
1342+
<option>Disabled</option>: WinMerge ignore unique subfolders when comparing folders.
1343+
</para>
1344+
</listitem>
1345+
</itemizedlist>
1346+
</section>
1347+
13481348
<section>
13491349
<title>
13501350
Ignore reparse points<indexterm>

‎Docs/Manual/Japanese/Configuration.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -767,16 +767,16 @@ Completely unhighlight the ignored differences<indexterm>
767767
<itemizedlist>
768768
<listitem>
769769
<para>
770-
<option>Enabled</option>: Makes the color of the different lines ignored by
771-
line filters and substitution filters the same as the color of the identical
772-
lines.</para>
770+
<option>Disabled</option> (default): Difference lines ignored by line
771+
filters and substitution filters are displayed in the color of Ignored
772+
Difference.</para>
773773
</listitem>
774774

775775
<listitem>
776776
<para>
777-
<option>Disabled</option> (default): Difference lines ignored by line
778-
filters and substitution filters are displayed in the color of Ignored
779-
Difference.</para>
777+
<option>Enabled</option>: Makes the color of the different lines ignored by
778+
line filters and substitution filters the same as the color of the identical
779+
lines.</para>
780780
</listitem>
781781
</itemizedlist>
782782
</section>
@@ -969,27 +969,6 @@ Difference.</para>
969969
</itemizedlist>
970970
</section>
971971

972-
<section>
973-
<title>
974-
片方にしか存在しないフォルダー内も含める<indexterm>
975-
<primary>include unique subfolders</primary>
976-
977-
<secondary>detecting and ignoring differences</secondary>
978-
</indexterm></title>
979-
980-
<itemizedlist>
981-
<listitem>
982-
<para>
983-
<option>無効</option>(デフォルト): WinMerge は、比較時片方しか存在しないサブフォルダーを無視します。</para>
984-
</listitem>
985-
986-
<listitem>
987-
<para>
988-
<option>有効</option>: WinMerge は、片方しか存在しないサブフォルダー内の内容も表示します。</para>
989-
</listitem>
990-
</itemizedlist>
991-
</section>
992-
993972
<section>
994973
<title>
995974
Include subfolders<indexterm>
@@ -1060,6 +1039,27 @@ folder.</para>
10601039
</variablelist>
10611040
</section>
10621041

1042+
<section>
1043+
<title>
1044+
片方にしか存在しないフォルダー内も含める<indexterm>
1045+
<primary>include unique subfolders</primary>
1046+
1047+
<secondary>detecting and ignoring differences</secondary>
1048+
</indexterm></title>
1049+
1050+
<itemizedlist>
1051+
<listitem>
1052+
<para>
1053+
<option>有効</option>(デフォルト): WinMerge は、片方しか存在しないサブフォルダー内の内容も表示します。</para>
1054+
</listitem>
1055+
1056+
<listitem>
1057+
<para>
1058+
<option>無効</option>: WinMerge は、比較時片方しか存在しないサブフォルダーを無視します。</para>
1059+
</listitem>
1060+
</itemizedlist>
1061+
</section>
1062+
10631063
<section>
10641064
<title>
10651065
再解析ポイントを無視する<indexterm>

0 commit comments

Comments
 (0)