Araxis Merge File Comparison Report

Produced by Araxis Merge on Wed May 9 18:36:29 2007 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.

1. Files compared

# Location File Last Modified
1 C:\SVN\wwhapi-v4.0.7.1\apis\javascript\examples\wwhelp_v5.0\srcdocs_projects\master_project\Formats\WebWorks Help 5.0\Transforms wwhelp_settings.fti Wed May 9 18:24:56 2007 UTC
2 C:\Program Files\WebWorks\ePublisher Pro\Formats\WebWorks Help 5.0\Transforms wwhelp_settings.fti Mon Dec 12 04:23:50 2005 UTC

2. Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 6 154
Changed 0 0
Inserted 0 0
Removed 2 11

3. Comparison options

Whitespace Differences in whitespace are significant
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

4. Active regular expressions

Expression Description
ChangeID=".*" IgnoreChangeID

5. Comparison detail

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     <Class n ame="autom atic">    
5       <Item  value="aut omatic" />    
6     </Class>    
7      
8     <Class n ame="wwhel p-skin">   4     <Class n ame="wwhel p-skin">
9      <Item v alue="Clas sic" strin gid="wwhel p-theme-cl assic" />   5      <Item v alue="Clas sic" strin gid="wwhel p-theme-cl assic" />
10      <Item v alue="Aero _Blue" str ingid="wwh elp-theme- aero-blue"  />   6      <Item v alue="Aero _Blue" str ingid="wwh elp-theme- aero-blue"  />
11      <Item v alue="Aero _Gray" str ingid="wwh elp-theme- aero-gray"  />   7      <Item v alue="Aero _Gray" str ingid="wwh elp-theme- aero-gray"  />
12      <Item v alue="Aero _Green" st ringid="ww help-theme -aero-gree n" />   8      <Item v alue="Aero _Green" st ringid="ww help-theme -aero-gree n" />
13      <Item v alue="Aero _Red" stri ngid="wwhe lp-theme-a ero-red" / >   9      <Item v alue="Aero _Red" stri ngid="wwhe lp-theme-a ero-red" / >
14      <Item v alue="Arch itect_Blue " stringid ="wwhelp-t heme-archi tect-blue"  />   10      <Item v alue="Arch itect_Blue " stringid ="wwhelp-t heme-archi tect-blue"  />
15      <Item v alue="Arch itect_Gray " stringid ="wwhelp-t heme-archi tect-gray"  />   11      <Item v alue="Arch itect_Gray " stringid ="wwhelp-t heme-archi tect-gray"  />
16      <Item v alue="Arch itect_Gree n" stringi d="wwhelp- theme-arch itect-gree n" />   12      <Item v alue="Arch itect_Gree n" stringi d="wwhelp- theme-arch itect-gree n" />
17      <Item v alue="Arch itect_Red"  stringid= "wwhelp-th eme-archit ect-red" / >   13      <Item v alue="Arch itect_Red"  stringid= "wwhelp-th eme-archit ect-red" / >
18      <Item v alue="Free form_Blue"  stringid= "wwhelp-th eme-freefo rm-blue" / >   14      <Item v alue="Free form_Blue"  stringid= "wwhelp-th eme-freefo rm-blue" / >
19      <Item v alue="Free form_Gray"  stringid= "wwhelp-th eme-freefo rm-gray" / >   15      <Item v alue="Free form_Gray"  stringid= "wwhelp-th eme-freefo rm-gray" / >
20      <Item v alue="Free form_Green " stringid ="wwhelp-t heme-freef orm-green"  />   16      <Item v alue="Free form_Green " stringid ="wwhelp-t heme-freef orm-green"  />
21      <Item v alue="Free form_Red"  stringid=" wwhelp-the me-freefor m-red" />   17      <Item v alue="Free form_Red"  stringid=" wwhelp-the me-freefor m-red" />
22      <Item v alue="Lobb y_Blue" st ringid="ww help-theme -lobby-blu e" />   18      <Item v alue="Lobb y_Blue" st ringid="ww help-theme -lobby-blu e" />
23      <Item v alue="Lobb y_Gray" st ringid="ww help-theme -lobby-gra y" />   19      <Item v alue="Lobb y_Gray" st ringid="ww help-theme -lobby-gra y" />
24      <Item v alue="Lobb y_Green" s tringid="w whelp-them e-lobby-gr een" />   20      <Item v alue="Lobb y_Green" s tringid="w whelp-them e-lobby-gr een" />
25      <Item v alue="Lobb y_Red" str ingid="wwh elp-theme- lobby-red"  />   21      <Item v alue="Lobb y_Red" str ingid="wwh elp-theme- lobby-red"  />
26     </Class>   22     </Class>
27     23  
28     <Class n ame="wwhel p-accessib ility">   24     <Class n ame="wwhel p-accessib ility">
29      <Item v alue="fals e" stringi d="wwhelp- accessibil ity-false"  />   25      <Item v alue="fals e" stringi d="wwhelp- accessibil ity-false"  />
30      <Item v alue="true " stringid ="wwhelp-a ccessibili ty-true" / >   26      <Item v alue="true " stringid ="wwhelp-a ccessibili ty-true" / >
31      <Item v alue="ask"  stringid= "wwhelp-ac cessibilit y-ask" />   27      <Item v alue="ask"  stringid= "wwhelp-ac cessibilit y-ask" />
32     </Class>   28     </Class>
33    </Classes >   29    </Classes >
34     30  
35    <Groups>   31    <Groups>
36     <Group n ame="wwhel p" />   32     <Group n ame="wwhel p" />
37    </Groups>   33    </Groups>
38     34  
39    <Settings >   35    <Settings >
40     <!-- Web Works Help  -->   36     <!-- Web Works Help  -->
41     <!--                 -->   37     <!--                 -->
42     <Setting  name="wwh elp-skin"  group="wwh elp" defau lt="Lobby_ Blue">   38     <Setting  name="wwh elp-skin"  group="wwh elp" defau lt="Lobby_ Blue">
43      <Settin gClass nam e="wwhelp- skin" />   39      <Settin gClass nam e="wwhelp- skin" />
44     </Settin g>   40     </Settin g>
45     <Setting  name="wwh elp-cookie s" group=" wwhelp" de fault="tru e">   41     <Setting  name="wwh elp-cookie s" group=" wwhelp" de fault="tru e">
46      <Settin gClass nam e="boolean " />   42      <Settin gClass nam e="boolean " />
47     </Settin g>   43     </Settin g>
48     <Setting  name="wwh elp-cookie s-id" grou p="wwhelp"  default=" automatic" >    
49       <Setti ngClass na me="automa tic" />    
50       <Setti ngClass na me="string " />    
51     </Settin g>    
52     <Setting  name="wwh elp-cookie s-daystoex pire" grou p="wwhelp"  default=" 30">    
53       <Setti ngClass na me="number " />    
54     </Settin g>    
55     <Setting  name="wwh elp-access ibility" g roup="wwhe lp" defaul t="false">   44     <Setting  name="wwh elp-access ibility" g roup="wwhe lp" defaul t="false">
56      <Settin gClass nam e="wwhelp- accessibil ity" />   45      <Settin gClass nam e="wwhelp- accessibil ity" />
57     </Settin g>   46     </Settin g>
58     <Setting  name="wwh elp-sync-t oc" group= "wwhelp" d efault="tr ue">   47     <Setting  name="wwh elp-sync-t oc" group= "wwhelp" d efault="tr ue">
59      <Settin gClass nam e="boolean " />   48      <Settin gClass nam e="boolean " />
60     </Settin g>   49     </Settin g>
61     <Setting  name="wwh elp-previo us-next" g roup="wwhe lp" defaul t="true">   50     <Setting  name="wwh elp-previo us-next" g roup="wwhe lp" defaul t="true">
62      <Settin gClass nam e="boolean " />   51      <Settin gClass nam e="boolean " />
63     </Settin g>   52     </Settin g>
64     <Setting  name="wwh elp-relate d-topics-i con" group ="wwhelp"  default="t rue">   53     <Setting  name="wwh elp-relate d-topics-i con" group ="wwhelp"  default="t rue">
65      <Settin gClass nam e="boolean " />   54      <Settin gClass nam e="boolean " />
66     </Settin g>   55     </Settin g>
67     <Setting  name="wwh elp-relate d-topics-i nline" gro up="wwhelp " default= "true">   56     <Setting  name="wwh elp-relate d-topics-i nline" gro up="wwhelp " default= "true">
68      <Settin gClass nam e="boolean " />   57      <Settin gClass nam e="boolean " />
69     </Settin g>   58     </Settin g>
70     <Setting  name="wwh elp-print"  group="ww help" defa ult="true" >   59     <Setting  name="wwh elp-print"  group="ww help" defa ult="true" >
71      <Settin gClass nam e="boolean " />   60      <Settin gClass nam e="boolean " />
72     </Settin g>   61     </Settin g>
73     <Setting  name="wwh elp-bookma rk" group= "wwhelp" d efault="fa lse">   62     <Setting  name="wwh elp-bookma rk" group= "wwhelp" d efault="fa lse">
74      <Settin gClass nam e="boolean " />   63      <Settin gClass nam e="boolean " />
75     </Settin g>   64     </Settin g>
76     <Setting  name="wwh elp-pdf" g roup="wwhe lp" defaul t="false">   65     <Setting  name="wwh elp-pdf" g roup="wwhe lp" defaul t="false">
77      <Settin gClass nam e="boolean " />   66      <Settin gClass nam e="boolean " />
78     </Settin g>   67     </Settin g>
79     <Setting  name="wwh elp-search " group="w whelp" def ault="true ">   68     <Setting  name="wwh elp-search " group="w whelp" def ault="true ">
80      <Settin gClass nam e="boolean " />   69      <Settin gClass nam e="boolean " />
81     </Settin g>   70     </Settin g>
82     <Setting  name="wwh elp-favori tes" group ="wwhelp"  default="t rue">   71     <Setting  name="wwh elp-favori tes" group ="wwhelp"  default="t rue">
83      <Settin gClass nam e="boolean " />   72      <Settin gClass nam e="boolean " />
84     </Settin g>   73     </Settin g>
85    </Setting s>   74    </Setting s>
86     75  
87    <RuleTrai tsSet />   76    <RuleTrai tsSet />
88   </FormatTr aitInfo>   77   </FormatTr aitInfo>

Araxis Merge (but not the data content of this report) is Copyright © 1993-2007 Araxis Ltd (www.araxis.com). All rights reserved.