33. Araxis Merge File Comparison Report

Produced by Araxis Merge on Wed Jan 21 22:23:30 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.

33.1 Files compared

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

33.2 Comparison summary

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

33.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

33.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

33.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="UTF- 8" stringi d="encodin g-utf-8" / > CR LF   5      <Item v alue="UTF- 8" stringi d="encodin g-utf-8" / > CR LF
6      <Item v alue="ISO- 8859-1" st ringid="en coding-iso -8859-1" / > CR LF   6      <Item v alue="ISO- 8859-1" st ringid="en coding-iso -8859-1" / > CR LF
7      <Item v alue="Shif t_JIS" str ingid="enc oding-shif t-jis" /> CR LF   7      <Item v alue="Shif t_JIS" str ingid="enc oding-shif t-jis" /> CR LF
8      <Item v alue="EUC- KR" string id="encodi ng-euc-kr"  /> CR LF   8      <Item v alue="EUC- KR" string id="encodi ng-euc-kr"  /> CR LF
9      <Item v alue="GB23 12" string id="encodi ng-gb2312"  /> CR LF   9      <Item v alue="GB23 12" string id="encodi ng-gb2312"  /> CR LF
10      <Item v alue="Big5 " stringid ="encoding -big5" /> CR LF   10      <Item v alue="Big5 " stringid ="encoding -big5" /> CR LF
11      <Item v alue="Wind ows-1250"  stringid=" encoding-w indows-125 0" /> CR LF   11      <Item v alue="Wind ows-1250"  stringid=" encoding-w indows-125 0" /> CR LF
12      <Item v alue="Wind ows-1251"  stringid=" encoding-w indows-125 1" /> CR LF   12      <Item v alue="Wind ows-1251"  stringid=" encoding-w indows-125 1" /> CR LF
13      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF   13      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF
14      <Item v alue="Wind ows-1253"  stringid=" encoding-w indows-125 3" /> CR LF   14      <Item v alue="Wind ows-1253"  stringid=" encoding-w indows-125 3" /> CR LF
15      <Item v alue="Wind ows-1254"  stringid=" encoding-w indows-125 4" /> CR LF   15      <Item v alue="Wind ows-1254"  stringid=" encoding-w indows-125 4" /> CR LF
16      <Item v alue="Wind ows-1257"  stringid=" encoding-w indows-125 7" /> CR LF   16      <Item v alue="Wind ows-1257"  stringid=" encoding-w indows-125 7" /> CR LF
17     </Class> CR LF   17     </Class> CR LF
18   CR LF   18   CR LF
19     <Class n ame="bread crumbs-sep arator" va lidater="s tring"> CR LF   19     <Class n ame="bread crumbs-sep arator" va lidater="s tring"> CR LF
20      <Common  value=" :  " /> CR LF   20      <Common  value=" :  " /> CR LF
21      <Common  value=" & gt; " /> CR LF   21      <Common  value=" & gt; " /> CR LF
22     </Class> CR LF   22     </Class> CR LF
23   CR LF   23   CR LF
24     <Class n ame="marke r-type"> CR LF   24     <Class n ame="marke r-type"> CR LF
25      <Item v alue="igno re" string id="ignore " /> CR LF   25      <Item v alue="igno re" string id="ignore " /> CR LF
26      <Item v alue="file name" stri ngid="file name" /> CR LF   26      <Item v alue="file name" stri ngid="file name" /> CR LF
27      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF   27      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF
28      <Item v alue="imag e-alt-text " stringid ="image-al t-text" /> CR LF   28      <Item v alue="imag e-alt-text " stringid ="image-al t-text" /> CR LF
29      <Item v alue="imag e-area-alt -text" str ingid="ima ge-area-al t-text" /> CR LF   29      <Item v alue="imag e-area-alt -text" str ingid="ima ge-area-al t-text" /> CR LF
30      <Item v alue="imag e-scale" / > CR LF   30      <Item v alue="imag e-scale" / > CR LF
31      <Item v alue="link -title" st ringid="li nk-title"  /> CR LF   31      <Item v alue="link -title" st ringid="li nk-title"  /> CR LF
    32      <Item v alue="pass -through"  stringid=" pass-throu gh" /> CR LF
32      <Item v alue="popu p-start" / > CR LF   33      <Item v alue="popu p-start" / > CR LF
33      <Item v alue="popu p-start-no -output" / > CR LF   34      <Item v alue="popu p-start-no -output" / > CR LF
34      <Item v alue="popu p-end" /> CR LF   35      <Item v alue="popu p-end" /> CR LF
35      <Item v alue="topi c" stringi d="topic"  /> CR LF   36      <Item v alue="topi c" stringi d="topic"  /> CR LF
36      <Item v alue="toc- icon-java- help" stri ngid="toc- icon-java- help" /> CR LF   37      <Item v alue="toc- icon-java- help" stri ngid="toc- icon-java- help" /> CR LF
37     </Class> CR LF   38     </Class> CR LF
38   CR LF   39   CR LF
39     <Class n ame="popup "> CR LF   40     <Class n ame="popup "> CR LF
40      <Item v alue="none " /> CR LF   41      <Item v alue="none " /> CR LF
41      <Item v alue="defi ne" /> CR LF   42      <Item v alue="defi ne" /> CR LF
42      <Item v alue="defi ne-no-outp ut" /> CR LF   43      <Item v alue="defi ne-no-outp ut" /> CR LF
43      <Item v alue="appe nd" /> CR LF   44      <Item v alue="appe nd" /> CR LF
44      <Item v alue="appe nd-no-outp ut" /> CR LF   45      <Item v alue="appe nd-no-outp ut" /> CR LF
45     </Class> CR LF   46     </Class> CR LF
46   CR LF   47   CR LF
47     <Class n ame="relat ed-topic"> CR LF   48     <Class n ame="relat ed-topic"> CR LF
48      <Item v alue="none " /> CR LF   49      <Item v alue="none " /> CR LF
49      <Item v alue="defi ne" /> CR LF   50      <Item v alue="defi ne" /> CR LF
50      <Item v alue="defi ne-no-outp ut" /> CR LF   51      <Item v alue="defi ne-no-outp ut" /> CR LF
51     </Class> CR LF   52     </Class> CR LF
52    </Classes > CR LF   53    </Classes > CR LF
53   CR LF   54   CR LF
54    <Groups> CR LF   55    <Groups> CR LF
55     <Group n ame="files " /> CR LF   56     <Group n ame="files " /> CR LF
56     <Group n ame="toc"  /> CR LF   57     <Group n ame="toc"  /> CR LF
57     <Group n ame="acces sibility"  /> CR LF   58     <Group n ame="acces sibility"  /> CR LF
58     <Group n ame="pdf"  /> CR LF   59     <Group n ame="pdf"  /> CR LF
59     <Group n ame="optio ns" /> CR LF   60     <Group n ame="optio ns" /> CR LF
60     <Group n ame="navig ation" /> CR LF   61     <Group n ame="navig ation" /> CR LF
61     <Group n ame="file- processing " /> CR LF   62     <Group n ame="file- processing " /> CR LF
62    </Groups> CR LF   63    </Groups> CR LF
63   CR LF   64   CR LF
64    <Settings > CR LF   65    <Settings > CR LF
65     <!-- Enc oding --> CR LF   66     <!-- Enc oding --> CR LF
66     <!--           --> CR LF   67     <!--           --> CR LF
67     <Setting  name="enc oding" gro up="locale " default= "UTF-8"> CR LF   68     <Setting  name="enc oding" gro up="locale " default= "UTF-8"> CR LF
68      <Settin gClass nam e="encodin g" /> CR LF   69      <Settin gClass nam e="encodin g" /> CR LF
69     </Settin g> CR LF   70     </Settin g> CR LF
70   CR LF   71   CR LF
71     <!-- Acc essibility  --> CR LF   72     <!-- Acc essibility  --> CR LF
72     <!--                 --> CR LF   73     <!--                 --> CR LF
73     <Setting  name="acc essibility -skip-navi gation-lin k" group=" accessibil ity" defau lt="false" > CR LF   74     <Setting  name="acc essibility -skip-navi gation-lin k" group=" accessibil ity" defau lt="false" > CR LF
74      <Settin gClass nam e="boolean " /> CR LF   75      <Settin gClass nam e="boolean " /> CR LF
75     </Settin g> CR LF   76     </Settin g> CR LF
76   CR LF   77   CR LF
77     <!-- Pro cessing -- > CR LF   78     <!-- Pro cessing -- > CR LF
78     <!--             -- > CR LF   79     <!--             -- > CR LF
79     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF   80     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF
80      <Settin gClass nam e="process ing" /> CR LF   81      <Settin gClass nam e="process ing" /> CR LF
81     </Settin g> CR LF   82     </Settin g> CR LF
82     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF   83     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF
83      <Settin gClass nam e="process ing" /> CR LF   84      <Settin gClass nam e="process ing" /> CR LF
84     </Settin g> CR LF   85     </Settin g> CR LF
85     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF   86     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF
86      <Settin gClass nam e="process ing" /> CR LF   87      <Settin gClass nam e="process ing" /> CR LF
87     </Settin g> CR LF   88     </Settin g> CR LF
88    </Setting s> CR LF   89    </Setting s> CR LF
89   CR LF   90   CR LF
90    <RuleTrai tsSet> CR LF   91    <RuleTrai tsSet> CR LF
91     <RuleTra its catego ry="Paragr aph"> CR LF   92     <RuleTra its catego ry="Paragr aph"> CR LF
92      <Option s> CR LF   93      <Option s> CR LF
93       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF   94       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF
94        <Opti onClass na me="boolea n" /> CR LF   95        <Opti onClass na me="boolea n" /> CR LF
95       </Opti on> CR LF   96       </Opti on> CR LF
96       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF   97       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF
97        <Opti onClass na me="boolea n" /> CR LF   98        <Opti onClass na me="boolea n" /> CR LF
98       </Opti on> CR LF   99       </Opti on> CR LF
99       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF   100       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF
100        <Opti onClass na me="none"  /> CR LF   101        <Opti onClass na me="none"  /> CR LF
101        <Opti onClass na me="number " /> CR LF   102        <Opti onClass na me="number " /> CR LF
102       </Opti on> CR LF   103       </Opti on> CR LF
103       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF   104       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF
104        <Opti onClass na me="none"  /> CR LF   105        <Opti onClass na me="none"  /> CR LF
105        <Opti onClass na me="all" / > CR LF   106        <Opti onClass na me="all" / > CR LF
106        <Opti onClass na me="number " /> CR LF   107        <Opti onClass na me="number " /> CR LF
107       </Opti on> CR LF   108       </Opti on> CR LF
108       <Optio n name="po pup" group ="options"  default=" none"> CR LF   109       <Optio n name="po pup" group ="options"  default=" none"> CR LF
109        <Opti onClass na me="popup"  /> CR LF   110        <Opti onClass na me="popup"  /> CR LF
110       </Opti on> CR LF   111       </Opti on> CR LF
111       <Optio n name="po pup-page-r ule" group ="options"  default=" "> CR LF   112       <Optio n name="po pup-page-r ule" group ="options"  default=" "> CR LF
112        <Opti onClass na me="page-r ule" /> CR LF   113        <Opti onClass na me="page-r ule" /> CR LF
113       </Opti on> CR LF   114       </Opti on> CR LF
114       <Optio n name="re lated-topi c" group=" options" d efault="no ne"> CR LF   115       <Optio n name="re lated-topi c" group=" options" d efault="no ne"> CR LF
115        <Opti onClass na me="relate d-topic" / > CR LF   116        <Opti onClass na me="relate d-topic" / > CR LF
116       </Opti on> CR LF   117       </Opti on> CR LF
    118       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    119        <Opti onClass na me="boolea n" /> CR LF
    120       </Opti on> CR LF
117      </Optio ns> CR LF   121      </Optio ns> CR LF
118   CR LF   122   CR LF
119      <Proper ties /> CR LF   123      <Proper ties /> CR LF
120     </RuleTr aits> CR LF   124     </RuleTr aits> CR LF
121   CR LF   125   CR LF
122     <RuleTra its catego ry="Charac ter"> CR LF   126     <RuleTra its catego ry="Charac ter"> CR LF
123      <Option s> CR LF   127      <Option s> CR LF
124       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   128       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
125        <Opti onClass na me="boolea n" /> CR LF   129        <Opti onClass na me="boolea n" /> CR LF
126       </Opti on> CR LF   130       </Opti on> CR LF
    131       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    132        <Opti onClass na me="boolea n" /> CR LF
    133       </Opti on> CR LF
127      </Optio ns> CR LF   134      </Optio ns> CR LF
128   CR LF   135   CR LF
129      <Proper ties /> CR LF   136      <Proper ties /> CR LF
130     </RuleTr aits> CR LF   137     </RuleTr aits> CR LF
131   CR LF   138   CR LF
132     <RuleTra its catego ry="Table" > CR LF   139     <RuleTra its catego ry="Table" > CR LF
133      <Option s /> CR LF   140      <Option s /> CR LF
134   CR LF   141   CR LF
135      <Proper ties /> CR LF   142      <Proper ties /> CR LF
136     </RuleTr aits> CR LF   143     </RuleTr aits> CR LF
137   CR LF   144   CR LF
138     <RuleTra its catego ry="Page"> CR LF   145     <RuleTra its catego ry="Page"> CR LF
139      <Option s> CR LF   146      <Option s> CR LF
140       <Optio n name="fi le-extensi on" group= "options"  default=". html"> CR LF   147       <Optio n name="fi le-extensi on" group= "options"  default=". html"> CR LF
141        <Opti onClass na me="file-e xtension"  /> CR LF   148        <Opti onClass na me="file-e xtension"  /> CR LF
142       </Opti on> CR LF   149       </Opti on> CR LF
143       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   150       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
144        <Opti onClass na me="boolea n" /> CR LF   151        <Opti onClass na me="boolea n" /> CR LF
145       </Opti on> CR LF   152       </Opti on> CR LF
146       <Optio n name="na vigation-t op-generat e" group=" navigation " default= "true"> CR LF   153       <Optio n name="na vigation-t op-generat e" group=" navigation " default= "true"> CR LF
147        <Opti onClass na me="boolea n" /> CR LF   154        <Opti onClass na me="boolea n" /> CR LF
148       </Opti on> CR LF   155       </Opti on> CR LF
149       <Optio n name="na vigation-b ottom-gene rate" grou p="navigat ion" defau lt="false" > CR LF   156       <Optio n name="na vigation-b ottom-gene rate" grou p="navigat ion" defau lt="false" > CR LF
150        <Opti onClass na me="boolea n" /> CR LF   157        <Opti onClass na me="boolea n" /> CR LF
151       </Opti on> CR LF   158       </Opti on> CR LF
152       <Optio n name="br eadcrumbs- top-genera te" group= "navigatio n" default ="true"> CR LF   159       <Optio n name="br eadcrumbs- top-genera te" group= "navigatio n" default ="true"> CR LF
153        <Opti onClass na me="boolea n" /> CR LF   160        <Opti onClass na me="boolea n" /> CR LF
154       </Opti on> CR LF   161       </Opti on> CR LF
155       <Optio n name="br eadcrumbs- bottom-gen erate" gro up="naviga tion" defa ult="false "> CR LF   162       <Optio n name="br eadcrumbs- bottom-gen erate" gro up="naviga tion" defa ult="false "> CR LF
156        <Opti onClass na me="boolea n" /> CR LF   163        <Opti onClass na me="boolea n" /> CR LF
157       </Opti on> CR LF   164       </Opti on> CR LF
158       <Optio n name="do cument-css " group="o ptions" de fault=""> CR LF   165       <Optio n name="do cument-css " group="o ptions" de fault=""> CR LF
159        <Opti onClass na me="projec t-file-pat h" /> CR LF   166        <Opti onClass na me="projec t-file-pat h" /> CR LF
160       </Opti on> CR LF   167       </Opti on> CR LF
161      </Optio ns> CR LF   168      </Optio ns> CR LF
162   CR LF   169   CR LF
163      <Proper ties> CR LF   170      <Proper ties> CR LF
164       <!-- N avigation  --> CR LF   171       <!-- N avigation  --> CR LF
165       <!--              --> CR LF   172       <!--              --> CR LF
166       <Prope rty name=" navigation -top-align ment" grou p="navigat ion" defau lt="left"> CR LF   173       <Prope rty name=" navigation -top-align ment" grou p="navigat ion" defau lt="left"> CR LF
167        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   174        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
168       </Prop erty> CR LF   175       </Prop erty> CR LF
169       <Prope rty name=" navigation -bottom-al ignment" g roup="navi gation" de fault="lef t"> CR LF   176       <Prope rty name=" navigation -bottom-al ignment" g roup="navi gation" de fault="lef t"> CR LF
170        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   177        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
171       </Prop erty> CR LF   178       </Prop erty> CR LF
172       <Prope rty name=" breadcrumb s-separato r" group=" navigation " default= " : "> CR LF   179       <Prope rty name=" breadcrumb s-separato r" group=" navigation " default= " : "> CR LF
173        <Prop ertyClass  name="brea dcrumbs-se parator" / > CR LF   180        <Prop ertyClass  name="brea dcrumbs-se parator" / > CR LF
174       </Prop erty> CR LF   181       </Prop erty> CR LF
175       <Prope rty name=" breadcrumb s-top-alig nment" gro up="naviga tion" defa ult="left" > CR LF   182       <Prope rty name=" breadcrumb s-top-alig nment" gro up="naviga tion" defa ult="left" > CR LF
176        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   183        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
177       </Prop erty> CR LF   184       </Prop erty> CR LF
178       <Prope rty name=" breadcrumb s-bottom-a lignment"  group="nav igation" d efault="le ft"> CR LF   185       <Prope rty name=" breadcrumb s-bottom-a lignment"  group="nav igation" d efault="le ft"> CR LF
179        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF   186        <Prop ertyClass  name="posi tion-horiz ontal" /> CR LF
180       </Prop erty> CR LF   187       </Prop erty> CR LF
181      </Prope rties> CR LF   188      </Prope rties> CR LF
182     </RuleTr aits> CR LF   189     </RuleTr aits> CR LF
183   CR LF   190   CR LF
184     <RuleTra its catego ry="Marker "> CR LF   191     <RuleTra its catego ry="Marker "> CR LF
185      <Option s> CR LF   192      <Option s> CR LF
186       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF   193       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF
187        <Opti onClass na me="marker -type" /> CR LF   194        <Opti onClass na me="marker -type" /> CR LF
188       </Opti on> CR LF   195       </Opti on> CR LF
189      </Optio ns> CR LF   196      </Optio ns> CR LF
190   CR LF   197   CR LF
191      <Proper ties /> CR LF   198      <Proper ties /> CR LF
192     </RuleTr aits> CR LF   199     </RuleTr aits> CR LF
193   CR LF   200   CR LF
194     <RuleTra its catego ry="Graphi c"> CR LF   201     <RuleTra its catego ry="Graphi c"> CR LF
195      <Option s> CR LF   202      <Option s> CR LF
196       <Optio n name="by -reference -vector" g roup="opti ons" defau lt="false" > CR LF   203       <Optio n name="by -reference -vector" g roup="opti ons" defau lt="false" > CR LF
197        <Opti onClass na me="boolea n" /> CR LF   204        <Opti onClass na me="boolea n" /> CR LF
198       </Opti on> CR LF   205       </Opti on> CR LF
199      </Optio ns> CR LF   206      </Optio ns> CR LF
200   CR LF   207   CR LF
201      <Proper ties /> CR LF   208      <Proper ties /> CR LF
202     </RuleTr aits> CR LF   209     </RuleTr aits> CR LF
203    </RuleTra itsSet> CR LF   210    </RuleTra itsSet> CR LF
204   </FormatTr aitInfo> CR LF   211   </FormatTr aitInfo> CR LF