Produced by Araxis Merge on Thu Oct 16 22:30:02 2008 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.
# | Location | File | Last Modified |
---|---|---|---|
1 | C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.2\WebWorks\ePublisher Pro\Formats\Sun JavaHelp 2.0\Transforms | javahelp_index.fti | Wed Nov 9 23:31:44 2005 UTC |
2 | C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Sun JavaHelp 2.0\Transforms | javahelp_index.fti | Mon Oct 13 05:52:00 2008 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 90 |
Changed | 0 | 0 |
Inserted | 0 | 0 |
Removed | 1 | 4 |
Whitespace | All differences in whitespace within 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 | Not shown in the comparison detail |
No regular expressions were active.
1 | <?xml vers ion="1.0" encoding=" utf-8"?> | 1 | <?xml vers ion="1.0" encoding=" utf-8"?> | |||
2 | <FormatTra itInfo ver sion="1.0" xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> | 2 | <FormatTra itInfo ver sion="1.0" xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> | |||
3 | <Classes /> | 3 | <Classes /> | |||
4 | 4 | |||||
5 | <Groups> | 5 | <Groups> | |||
6 | <Group n ame="javah elp" /> | 6 | <Group n ame="javah elp" /> | |||
7 | </Groups> | 7 | </Groups> | |||
8 | 8 | |||||
9 | <Settings > | 9 | <Settings > | |||
10 | <!-- Jav aHelp --> | 10 | <!-- Jav aHelp --> | |||
11 | <!-- --> | 11 | <!-- --> | |||
12 | <Setting name="loc al-jdk-loc ation" gro up="javahe lp" defaul t="Default "> | 12 | <Setting name="loc al-jdk-loc ation" gro up="javahe lp" defaul t="Default "> | |||
13 | <Settin gClass nam e="path" / > | 13 | <Settin gClass nam e="path" / > | |||
14 | </Settin g> | 14 | </Settin g> | |||
15 | 15 | |||||
16 | <Setting name="loc al-javahel p-location " group="j avahelp" d efault="De fault"> | 16 | <Setting name="loc al-javahel p-location " group="j avahelp" d efault="De fault"> | |||
17 | <Settin gClass nam e="path" / > | 17 | <Settin gClass nam e="path" / > | |||
18 | </Settin g> | 18 | </Settin g> | |||
19 | 19 | |||||
20 | <Setting name="hel pset-title " group="j avahelp" d efault="De fault"> | |||||
21 | <Settin gClass nam e="string" /> | |||||
22 | </Settin g> | |||||
23 | ||||||
24 | <Setting name="cat egory-clos ed-image" group="jav ahelp" def ault=""> | 20 | <Setting name="cat egory-clos ed-image" group="jav ahelp" def ault=""> | |||
25 | <Settin gClass nam e="path" / > | 21 | <Settin gClass nam e="path" / > | |||
26 | </Settin g> | 22 | </Settin g> | |||
27 | 23 | |||||
28 | <Setting name="cat egory-open -image" gr oup="javah elp" defau lt=""> | 24 | <Setting name="cat egory-open -image" gr oup="javah elp" defau lt=""> | |||
29 | <Settin gClass nam e="path" / > | 25 | <Settin gClass nam e="path" / > | |||
30 | </Settin g> | 26 | </Settin g> | |||
31 | 27 | |||||
32 | <!-- UI tabs --> | 28 | <!-- UI tabs --> | |||
33 | <!-- --> | 29 | <!-- --> | |||
34 | <Setting name="ena ble-favori tes-tab" g roup="java help" defa ult="true" > | 30 | <Setting name="ena ble-favori tes-tab" g roup="java help" defa ult="true" > | |||
35 | <Settin gClass nam e="boolean " /> | 31 | <Settin gClass nam e="boolean " /> | |||
36 | </Settin g> | 32 | </Settin g> | |||
37 | 33 | |||||
38 | <Setting name="ena ble-search -tab" grou p="javahel p" default ="true"> | 34 | <Setting name="ena ble-search -tab" grou p="javahel p" default ="true"> | |||
39 | <Settin gClass nam e="boolean " /> | 35 | <Settin gClass nam e="boolean " /> | |||
40 | </Settin g> | 36 | </Settin g> | |||
41 | 37 | |||||
42 | <Setting name="ena ble-glossa ry-tab" gr oup="javah elp" defau lt="false" > | 38 | <Setting name="ena ble-glossa ry-tab" gr oup="javah elp" defau lt="false" > | |||
43 | <Settin gClass nam e="boolean " /> | 39 | <Settin gClass nam e="boolean " /> | |||
44 | </Settin g> | 40 | </Settin g> | |||
45 | 41 | |||||
46 | </Setting s> | 42 | </Setting s> | |||
47 | 43 | |||||
48 | <RuleTrai tsSet /> | 44 | <RuleTrai tsSet /> | |||
49 | </FormatTr aitInfo> | 45 | </FormatTr aitInfo> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2007 Araxis Ltd (www.araxis.com). All rights reserved.