57. Araxis Merge File Comparison Report

Produced by Araxis Merge on Wed Jan 21 22:23:36 2009 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

57.1 Files compared

# Location File Last Modified
1 Q:\Formats.2008.3.20682\WinHelp\Transforms pages.fti Mon Oct 13 05:51:50 2008 UTC
2 Q:\Formats.2008.4.20859\WinHelp\Transforms pages.fti Mon Jan 19 18:02:32 2009 UTC

57.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 8 298
Changed 0 0
Inserted 3 7
Removed 0 0

57.3 Comparison options

Whitespace Differences in whitespace at the start of lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Shown in the comparison detail

57.4 Active regular expressions

Expression Description
\$(Id|Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments
<LastModified>.*</LastModified> last modified
- Title ignore - Title

57.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?> CR LF   1   <?xml vers ion="1.0"  encoding=" utf-8"?> CR LF
2   <FormatTra itInfo ver sion="1.0"  xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> CR LF   2   <FormatTra itInfo ver sion="1.0"  xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> CR LF
3    <Classes> CR LF   3    <Classes> CR LF
4     <Class n ame="encod ing" valid ater="enco ding"> CR LF   4     <Class n ame="encod ing" valid ater="enco ding"> CR LF
5      <Item v alue="ISO- 8859-1" st ringid="en coding-iso -8859-1" / > CR LF   5      <Item v alue="ISO- 8859-1" st ringid="en coding-iso -8859-1" / > CR LF
6      <Item v alue="Shif t_JIS" str ingid="enc oding-shif t-jis" /> CR LF   6      <Item v alue="Shif t_JIS" str ingid="enc oding-shif t-jis" /> CR LF
7      <Item v alue="EUC- KR" string id="encodi ng-euc-kr"  /> CR LF   7      <Item v alue="EUC- KR" string id="encodi ng-euc-kr"  /> CR LF
8      <Item v alue="GB23 12" string id="encodi ng-gb2312"  /> CR LF   8      <Item v alue="GB23 12" string id="encodi ng-gb2312"  /> CR LF
9      <Item v alue="Big5 " stringid ="encoding -big5" /> CR LF   9      <Item v alue="Big5 " stringid ="encoding -big5" /> CR LF
10      <Item v alue="Wind ows-1250"  stringid=" encoding-w indows-125 0" /> CR LF   10      <Item v alue="Wind ows-1250"  stringid=" encoding-w indows-125 0" /> CR LF
11      <Item v alue="Wind ows-1251"  stringid=" encoding-w indows-125 1" /> CR LF   11      <Item v alue="Wind ows-1251"  stringid=" encoding-w indows-125 1" /> CR LF
12      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF   12      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF
13      <Item v alue="Wind ows-1253"  stringid=" encoding-w indows-125 3" /> CR LF   13      <Item v alue="Wind ows-1253"  stringid=" encoding-w indows-125 3" /> CR LF
14      <Item v alue="Wind ows-1254"  stringid=" encoding-w indows-125 4" /> CR LF   14      <Item v alue="Wind ows-1254"  stringid=" encoding-w indows-125 4" /> CR LF
15      <Item v alue="Wind ows-1257"  stringid=" encoding-w indows-125 7" /> CR LF   15      <Item v alue="Wind ows-1257"  stringid=" encoding-w indows-125 7" /> CR LF
16     </Class> CR LF   16     </Class> CR LF
17   CR LF   17   CR LF
18     <Class n ame="bread crumbs-sep arator" va lidater="s tring"> CR LF   18     <Class n ame="bread crumbs-sep arator" va lidater="s tring"> CR LF
19      <Common  value=" :  " /> CR LF   19      <Common  value=" :  " /> CR LF
20      <Common  value=" & gt; " /> CR LF   20      <Common  value=" & gt; " /> CR LF
21     </Class> CR LF   21     </Class> CR LF
22   CR LF   22   CR LF
23     <Class n ame="marke r-type"> CR LF   23     <Class n ame="marke r-type"> CR LF
24      <Item v alue="igno re" string id="ignore " /> CR LF   24      <Item v alue="igno re" string id="ignore " /> CR LF
25      <Item v alue="file name" stri ngid="file name" /> CR LF   25      <Item v alue="file name" stri ngid="file name" /> CR LF
26      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF   26      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF
27      <Item v alue="imag e-scale" / > CR LF   27      <Item v alue="imag e-scale" / > CR LF
    28      <Item v alue="pass -through"  stringid=" pass-throu gh" /> CR LF
28      <Item v alue="topi c" stringi d="topic"  /> CR LF   29      <Item v alue="topi c" stringi d="topic"  /> CR LF
29      <Item v alue="wind ow-type" s tringid="w indow-type " /> CR LF   30      <Item v alue="wind ow-type" s tringid="w indow-type " /> CR LF
30     </Class> CR LF   31     </Class> CR LF
31   CR LF   32   CR LF
32     <Class n ame="posit ion-horizo ntal"> CR LF   33     <Class n ame="posit ion-horizo ntal"> CR LF
33      <Item v alue="left " /> CR LF   34      <Item v alue="left " /> CR LF
34      <Item v alue="cent er" /> CR LF   35      <Item v alue="cent er" /> CR LF
35      <Item v alue="righ t" /> CR LF   36      <Item v alue="righ t" /> CR LF
36     </Class> CR LF   37     </Class> CR LF
37    </Classes > CR LF   38    </Classes > CR LF
38   CR LF   39   CR LF
39    <Groups> CR LF   40    <Groups> CR LF
40     <Group n ame="files " /> CR LF   41     <Group n ame="files " /> CR LF
41     <Group n ame="toc"  /> CR LF   42     <Group n ame="toc"  /> CR LF
42     <Group n ame="acces sibility"  /> CR LF   43     <Group n ame="acces sibility"  /> CR LF
43     <Group n ame="pdf"  /> CR LF   44     <Group n ame="pdf"  /> CR LF
44     <Group n ame="optio ns" /> CR LF   45     <Group n ame="optio ns" /> CR LF
45     <Group n ame="navig ation" /> CR LF   46     <Group n ame="navig ation" /> CR LF
46     <Group n ame="file- processing " /> CR LF   47     <Group n ame="file- processing " /> CR LF
47    </Groups> CR LF   48    </Groups> CR LF
48   CR LF   49   CR LF
49    <Settings > CR LF   50    <Settings > CR LF
50     <!-- Loc ale --> CR LF   51     <!-- Loc ale --> CR LF
51     <!--         --> CR LF   52     <!--         --> CR LF
52     <Setting  name="loc ale" group ="locale"  default="e n"> CR LF   53     <Setting  name="loc ale" group ="locale"  default="e n"> CR LF
53      <Settin gClass nam e="locale"  /> CR LF   54      <Settin gClass nam e="locale"  /> CR LF
54     </Settin g> CR LF   55     </Settin g> CR LF
55   CR LF   56   CR LF
56     <!-- Pro cessing -- > CR LF   57     <!-- Pro cessing -- > CR LF
57     <!--             -- > CR LF   58     <!--             -- > CR LF
58     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF   59     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF
59      <Settin gClass nam e="process ing" /> CR LF   60      <Settin gClass nam e="process ing" /> CR LF
60     </Settin g> CR LF   61     </Settin g> CR LF
61     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF   62     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF
62      <Settin gClass nam e="process ing" /> CR LF   63      <Settin gClass nam e="process ing" /> CR LF
63     </Settin g> CR LF   64     </Settin g> CR LF
64     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF   65     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF
65      <Settin gClass nam e="process ing" /> CR LF   66      <Settin gClass nam e="process ing" /> CR LF
66     </Settin g> CR LF   67     </Settin g> CR LF
67    </Setting s> CR LF   68    </Setting s> CR LF
68   CR LF   69   CR LF
69    <RuleTrai tsSet> CR LF   70    <RuleTrai tsSet> CR LF
70     <RuleTra its catego ry="Paragr aph"> CR LF   71     <RuleTra its catego ry="Paragr aph"> CR LF
71      <Option s> CR LF   72      <Option s> CR LF
72       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF   73       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF
73        <Opti onClass na me="boolea n" /> CR LF   74        <Opti onClass na me="boolea n" /> CR LF
74       </Opti on> CR LF   75       </Opti on> CR LF
75       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF   76       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF
76        <Opti onClass na me="boolea n" /> CR LF   77        <Opti onClass na me="boolea n" /> CR LF
77       </Opti on> CR LF   78       </Opti on> CR LF
78       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF   79       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF
79        <Opti onClass na me="none"  /> CR LF   80        <Opti onClass na me="none"  /> CR LF
80        <Opti onClass na me="number " /> CR LF   81        <Opti onClass na me="number " /> CR LF
81       </Opti on> CR LF   82       </Opti on> CR LF
82       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF   83       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF
83        <Opti onClass na me="none"  /> CR LF   84        <Opti onClass na me="none"  /> CR LF
84        <Opti onClass na me="all" / > CR LF   85        <Opti onClass na me="all" / > CR LF
85        <Opti onClass na me="number " /> CR LF   86        <Opti onClass na me="number " /> CR LF
86       </Opti on> CR LF   87       </Opti on> CR LF
    88       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    89        <Opti onClass na me="boolea n" /> CR LF
    90       </Opti on> CR LF
87      </Optio ns> CR LF   91      </Optio ns> CR LF
88   CR LF   92   CR LF
89      <Proper ties /> CR LF   93      <Proper ties /> CR LF
90     </RuleTr aits> CR LF   94     </RuleTr aits> CR LF
91   CR LF   95   CR LF
92     <RuleTra its catego ry="Charac ter"> CR LF   96     <RuleTra its catego ry="Charac ter"> CR LF
93      <Option s> CR LF   97      <Option s> CR LF
94       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   98       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
95        <Opti onClass na me="boolea n" /> CR LF   99        <Opti onClass na me="boolea n" /> CR LF
96       </Opti on> CR LF   100       </Opti on> CR LF
    101       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    102        <Opti onClass na me="boolea n" /> CR LF
    103       </Opti on> CR LF
97      </Optio ns> CR LF   104      </Optio ns> CR LF
98   CR LF   105   CR LF
99      <Proper ties /> CR LF   106      <Proper ties /> CR LF
100     </RuleTr aits> CR LF   107     </RuleTr aits> CR LF
101   CR LF   108   CR LF
102     <RuleTra its catego ry="Table" > CR LF   109     <RuleTra its catego ry="Table" > CR LF
103      <Option s /> CR LF   110      <Option s /> CR LF
104   CR LF   111   CR LF
105      <Proper ties /> CR LF   112      <Proper ties /> CR LF
106     </RuleTr aits> CR LF   113     </RuleTr aits> CR LF
107   CR LF   114   CR LF
108     <RuleTra its catego ry="Page"> CR LF   115     <RuleTra its catego ry="Page"> CR LF
109      <Option s> CR LF   116      <Option s> CR LF
110       <Optio n name="fi le-extensi on" group= "options"  default=". rtf"> CR LF   117       <Optio n name="fi le-extensi on" group= "options"  default=". rtf"> CR LF
111        <Opti onClass na me="file-e xtension"  /> CR LF   118        <Opti onClass na me="file-e xtension"  /> CR LF
112       </Opti on> CR LF   119       </Opti on> CR LF
113       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   120       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
114        <Opti onClass na me="boolea n" /> CR LF   121        <Opti onClass na me="boolea n" /> CR LF
115       </Opti on> CR LF   122       </Opti on> CR LF
116       <Optio n name="br eadcrumbs- top-genera te" group= "navigatio n" default ="true"> CR LF   123       <Optio n name="br eadcrumbs- top-genera te" group= "navigatio n" default ="true"> CR LF
117        <Opti onClass na me="boolea n" /> CR LF   124        <Opti onClass na me="boolea n" /> CR LF
118       </Opti on> CR LF   125       </Opti on> CR LF
119       <Optio n name="br eadcrumbs- bottom-gen erate" gro up="naviga tion" defa ult="false "> CR LF   126       <Optio n name="br eadcrumbs- bottom-gen erate" gro up="naviga tion" defa ult="false "> CR LF
120        <Opti onClass na me="boolea n" /> CR LF   127        <Opti onClass na me="boolea n" /> CR LF
121       </Opti on> CR LF   128       </Opti on> CR LF
122      </Optio ns> CR LF   129      </Optio ns> CR LF
123   CR LF   130   CR LF
124      <Proper ties> CR LF   131      <Proper ties> CR LF
125       <!-- N avigation  --> CR LF   132       <!-- N avigation  --> CR LF
126       <!--              --> CR LF   133       <!--              --> CR LF
127       <Prope rty name=" breadcrumb s-separato r" group=" navigation " default= " : "> CR LF   134       <Prope rty name=" breadcrumb s-separato r" group=" navigation " default= " : "> CR LF
128        <Prop ertyClass  name="brea dcrumbs-se parator" / > CR LF   135        <Prop ertyClass  name="brea dcrumbs-se parator" / > CR LF
129       </Prop erty> CR LF   136       </Prop erty> CR LF
130       <Prope rty name=" breadcrumb s-top-alig nment" gro up="naviga tion" defa ult="left" > CR LF   137       <Prope rty name=" breadcrumb s-top-alig nment" gro up="naviga tion" defa ult="left" > CR LF
131        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   138        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
132       </Prop erty> CR LF   139       </Prop erty> CR LF
133       <Prope rty name=" breadcrumb s-bottom-a lignment"  group="nav igation" d efault="le ft"> CR LF   140       <Prope rty name=" breadcrumb s-bottom-a lignment"  group="nav igation" d efault="le ft"> CR LF
134        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   141        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
135       </Prop erty> CR LF   142       </Prop erty> CR LF
136      </Prope rties> CR LF   143      </Prope rties> CR LF
137     </RuleTr aits> CR LF   144     </RuleTr aits> CR LF
138   CR LF   145   CR LF
139     <RuleTra its catego ry="Marker "> CR LF   146     <RuleTra its catego ry="Marker "> CR LF
140      <Option s> CR LF   147      <Option s> CR LF
141       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF   148       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF
142        <Opti onClass na me="marker -type" /> CR LF   149        <Opti onClass na me="marker -type" /> CR LF
143       </Opti on> CR LF   150       </Opti on> CR LF
144      </Optio ns> CR LF   151      </Optio ns> CR LF
145   CR LF   152   CR LF
146      <Proper ties /> CR LF   153      <Proper ties /> CR LF
147     </RuleTr aits> CR LF   154     </RuleTr aits> CR LF
148    </RuleTra itsSet> CR LF   155    </RuleTra itsSet> CR LF
149   </FormatTr aitInfo> CR LF   156   </FormatTr aitInfo> CR LF