41. Araxis Merge File Comparison Report

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

41.1 Files compared

# Location File Last Modified
1 Q:\Formats.2008.3.20682\WebWorks Help 5.0\Files\wwhelp\wwhimpl\js\html wwhelp.htm Mon Oct 13 05:51:54 2008 UTC
2 Q:\Formats.2008.4.20859\WebWorks Help 5.0\Files\wwhelp\wwhimpl\js\html wwhelp.htm Mon Jan 19 18:02:38 2009 UTC

41.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 4 250
Changed 0 0
Inserted 1 2
Removed 0 0

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

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

41.5 Comparison detail

1   <!DOCTYPE  HTML PUBLI C "-//W3C/ /DTD HTML  4.0 Frames et//EN" "h ttp://www. w3.org/TR/ REC-html40 /frameset. dtd"> CR LF   1   <!DOCTYPE  HTML PUBLI C "-//W3C/ /DTD HTML  4.0 Frames et//EN" "h ttp://www. w3.org/TR/ REC-html40 /frameset. dtd"> CR LF
2   <html> CR LF   2   <html> CR LF
3    <!-- Copy right (c)  2000-2006  Quadralay  Corporatio n.  All ri ghts reser ved. --> CR LF   3    <!-- Copy right (c)  2000-2006  Quadralay  Corporatio n.  All ri ghts reser ved. --> CR LF
4   CR LF   4   CR LF
5    <head> CR LF   5    <head> CR LF
6     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml"> CR LF   6     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml"> CR LF
7     <meta ht tp-equiv=" charset"       conten t="UTF-8"> CR LF   7     <meta ht tp-equiv=" charset"       conten t="UTF-8"> CR LF
8     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet --> CR LF   8     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet --> CR LF
9   CR LF   9   CR LF
10     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/title. js"></scri pt> CR LF   10     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/title. js"></scri pt> CR LF
11   CR LF   11   CR LF
12     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/popupf .js"></scr ipt> CR LF   12     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/popupf .js"></scr ipt> CR LF
13     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/option s.js"></sc ript> CR LF   13     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/option s.js"></sc ript> CR LF
14     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/locale .js"></scr ipt> CR LF   14     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/priv ate/locale .js"></scr ipt> CR LF
15     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/browse r.js"></sc ript> CR LF   15     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/browse r.js"></sc ript> CR LF
16     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/popup. js"></scri pt> CR LF   16     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/popup. js"></scri pt> CR LF
17     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/fileli st.js"></s cript> CR LF   17     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/fileli st.js"></s cript> CR LF
18     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/bookli st.js"></s cript> CR LF   18     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/bookli st.js"></s cript> CR LF
19     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/bookgr ps.js"></s cript> CR LF   19     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/bookgr ps.js"></s cript> CR LF
20     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/help.j s"></scrip t> CR LF   20     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/help.j s"></scrip t> CR LF
21     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/contro ls.js"></s cript> CR LF   21     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/contro ls.js"></s cript> CR LF
22     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/relate d.js"></sc ript> CR LF   22     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/relate d.js"></sc ript> CR LF
23     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/struti ls.js"></s cript> CR LF   23     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/struti ls.js"></s cript> CR LF
24     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/highlt .js"></scr ipt> CR LF   24     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/highlt .js"></scr ipt> CR LF
    25     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/unidat a.js"></sc ript> CR LF
    26     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../../c ommon/scri pts/unibre ak.js"></s cript> CR LF
25   CR LF   27   CR LF
26     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/handle r.js"></sc ript> CR LF   28     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/handle r.js"></sc ript> CR LF
27     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/option s.js"></sc ript> CR LF   29     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/option s.js"></sc ript> CR LF
28     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/locale .js"></scr ipt> CR LF   30     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/locale .js"></scr ipt> CR LF
29     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/tabs.j s"></scrip t> CR LF   31     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/tabs.j s"></scrip t> CR LF
30     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlin e.js"></sc ript> CR LF   32     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlin e.js"></sc ript> CR LF
31     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlsa fe.js"></s cript> CR LF   33     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlsa fe.js"></s cript> CR LF
32     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlfa st.js"></s cript> CR LF   34     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/outlfa st.js"></s cript> CR LF
33     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/index. js"></scri pt> CR LF   35     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/index. js"></scri pt> CR LF
34     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/pairs. js"></scri pt> CR LF   36     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/pairs. js"></scri pt> CR LF
35     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/phrase .js"></scr ipt> CR LF   37     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/phrase .js"></scr ipt> CR LF
36     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/mltphr s.js"></sc ript> CR LF   38     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/mltphr s.js"></sc ript> CR LF
37     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/search .js"></scr ipt> CR LF   39     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/search .js"></scr ipt> CR LF
38     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/favori te.js"></s cript> CR LF   40     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/favori te.js"></s cript> CR LF
39     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/panels .js"></scr ipt> CR LF   41     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/panels .js"></scr ipt> CR LF
40     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/javasc pt.js"></s cript> CR LF   42     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../scri pts/javasc pt.js"></s cript> CR LF
41   CR LF   43   CR LF
42     <script  type="text /javascrip t" languag e="JavaScr ipt1.2"> CR LF   44     <script  type="text /javascrip t" languag e="JavaScr ipt1.2"> CR LF
43      <!-- CR LF   45      <!-- CR LF
44       // Set  reference  to top le vel help f rame CR LF   46       // Set  reference  to top le vel help f rame CR LF
45       // CR LF   47       // CR LF
46       var  W WHFrame =  eval("wind ow.self"); CR LF   48       var  W WHFrame =  eval("wind ow.self"); CR LF
47       window .name = "W WHFrame"; CR LF   49       window .name = "W WHFrame"; CR LF
48   CR LF   50   CR LF
49       // Cre ate browse r info obj ect CR LF   51       // Cre ate browse r info obj ect CR LF
50       // CR LF   52       // CR LF
51       var  W WHBrowser  = new WWHB rowser_Obj ect(); CR LF   53       var  W WHBrowser  = new WWHB rowser_Obj ect(); CR LF
52   CR LF   54   CR LF
53       // Cre ate new he lp object CR LF   55       // Cre ate new he lp object CR LF
54       // CR LF   56       // CR LF
55       var  W WHHelp = n ew WWHHelp _Object(lo cation.hre f); CR LF   57       var  W WHHelp = n ew WWHHelp _Object(lo cation.hre f); CR LF
56   CR LF   58   CR LF
57       // Cre ate contro ls object CR LF   59       // Cre ate contro ls object CR LF
58       // CR LF   60       // CR LF
59       var  W WHControls  = new WWH Controls_O bject(); CR LF   61       var  W WHControls  = new WWH Controls_O bject(); CR LF
60   CR LF   62   CR LF
61       // Cre ate relate d topics o bject CR LF   63       // Cre ate relate d topics o bject CR LF
62       // CR LF   64       // CR LF
63       var  W WHRelatedT opics = ne w WWHRelat edTopics_O bject(); CR LF   65       var  W WHRelatedT opics = ne w WWHRelat edTopics_O bject(); CR LF
64   CR LF   66   CR LF
65       // Cre ate alinks  object CR LF   67       // Cre ate alinks  object CR LF
66       // CR LF   68       // CR LF
67       var  W WHALinks =  new WWHAL inks_Objec t(); CR LF   69       var  W WHALinks =  new WWHAL inks_Objec t(); CR LF
68   CR LF   70   CR LF
69       // Cre ate highli ght words  object CR LF   71       // Cre ate highli ght words  object CR LF
70       // CR LF   72       // CR LF
71       var  W WHHighligh tWords = n ew WWHHigh lightWords _Object(); CR LF   73       var  W WHHighligh tWords = n ew WWHHigh lightWords _Object(); CR LF
72   CR LF   74   CR LF
73       // Cre ate new ha ndler obje ct CR LF   75       // Cre ate new ha ndler obje ct CR LF
74       // CR LF   76       // CR LF
75       var  W WHHandler  = new WWHH andler_Obj ect(); CR LF   77       var  W WHHandler  = new WWHH andler_Obj ect(); CR LF
76   CR LF   78   CR LF
77       // Cre ate new Ja vaScript H elp object CR LF   79       // Cre ate new Ja vaScript H elp object CR LF
78       // CR LF   80       // CR LF
79       var  W WHJavaScri pt = new W WHJavaScri pt_Object( ); CR LF   81       var  W WHJavaScri pt = new W WHJavaScri pt_Object( ); CR LF
80   CR LF   82   CR LF
81       // Cre ate new ou tline obje ct CR LF   83       // Cre ate new ou tline obje ct CR LF
82       // CR LF   84       // CR LF
83       var  W WHOutline  = new WWHO utline_Obj ect(); CR LF   85       var  W WHOutline  = new WWHO utline_Obj ect(); CR LF
84   CR LF   86   CR LF
85       // Cre ate new in dex object CR LF   87       // Cre ate new in dex object CR LF
86       // CR LF   88       // CR LF
87       var  W WHIndex =  new WWHInd ex_Object( ); CR LF   89       var  W WHIndex =  new WWHInd ex_Object( ); CR LF
88   CR LF   90   CR LF
89       // Cre ate new se arch objec t CR LF   91       // Cre ate new se arch objec t CR LF
90       // CR LF   92       // CR LF
91       var  W WHSearch =  new WWHSe arch_Objec t(); CR LF   93       var  W WHSearch =  new WWHSe arch_Objec t(); CR LF
92   CR LF   94   CR LF
93       // Cre ate new fa vorites ob ject CR LF   95       // Cre ate new fa vorites ob ject CR LF
94       // CR LF   96       // CR LF
95       var  W WHFavorite s = new WW HFavorites _Object(); CR LF   97       var  W WHFavorite s = new WW HFavorites _Object(); CR LF
96   CR LF   98   CR LF
97       functi on  WWHFra me_HandleK eyDown(Par amEvent) CR LF   99       functi on  WWHFra me_HandleK eyDown(Par amEvent) CR LF
98       { CR LF   100       { CR LF
99         retu rn WWHFram e.WWHHelp. fHandleKey Down(Param Event); CR LF   101         retu rn WWHFram e.WWHHelp. fHandleKey Down(Param Event); CR LF
100       } CR LF   102       } CR LF
101   CR LF   103   CR LF
102       functi on  WWHFra me_HandleK eyPress(Pa ramEvent) CR LF   104       functi on  WWHFra me_HandleK eyPress(Pa ramEvent) CR LF
103       { CR LF   105       { CR LF
104         retu rn WWHFram e.WWHHelp. fHandleKey Press(Para mEvent); CR LF   106         retu rn WWHFram e.WWHHelp. fHandleKey Press(Para mEvent); CR LF
105       } CR LF   107       } CR LF
106   CR LF   108   CR LF
107       functi on  WWHFra me_HandleK eyUp(Param Event) CR LF   109       functi on  WWHFra me_HandleK eyUp(Param Event) CR LF
108       { CR LF   110       { CR LF
109         retu rn WWHFram e.WWHHelp. fHandleKey Up(ParamEv ent); CR LF   111         retu rn WWHFram e.WWHHelp. fHandleKey Up(ParamEv ent); CR LF
110       } CR LF   112       } CR LF
111      // --> CR LF   113      // --> CR LF
112     </script > CR LF   114     </script > CR LF
113    </head> CR LF   115    </head> CR LF
114   CR LF   116   CR LF
115    <frameset  cols="300 ,*" onload ="WWHHelp. fInitStage (0);" onke ydown="WWH Frame_Hand leKeyDown( (document. all||docum ent.getEle mentById|| document.l ayers)?eve nt:null);"  onkeypres s="WWHFram e_HandleKe yPress((do cument.all ||document .getElemen tById||doc ument.laye rs)?event: null);" on keyup="WWH Frame_Hand leKeyUp((d ocument.al l||documen t.getEleme ntById||do cument.lay ers)?event :null);"> CR LF   117    <frameset  cols="300 ,*" onload ="WWHHelp. fInitStage (0);" onke ydown="WWH Frame_Hand leKeyDown( (document. all||docum ent.getEle mentById|| document.l ayers)?eve nt:null);"  onkeypres s="WWHFram e_HandleKe yPress((do cument.all ||document .getElemen tById||doc ument.laye rs)?event: null);" on keyup="WWH Frame_Hand leKeyUp((d ocument.al l||documen t.getEleme ntById||do cument.lay ers)?event :null);"> CR LF
116     <frame n ame="" src ="navigate .htm" scro lling="no" > CR LF   118     <frame n ame="" src ="navigate .htm" scro lling="no" > CR LF
117     <frame n ame="" src ="../../co mmon/html/ content.ht m" scrolli ng="auto"> CR LF   119     <frame n ame="" src ="../../co mmon/html/ content.ht m" scrolli ng="auto"> CR LF
118   CR LF   120   CR LF
119     <noframe s> CR LF   121     <noframe s> CR LF
120      <body> CR LF   122      <body> CR LF
121       <p>Thi s page use s frames,  but your b rowser doe sn't suppo rt them.</ p> CR LF   123       <p>Thi s page use s frames,  but your b rowser doe sn't suppo rt them.</ p> CR LF
122      </body> CR LF   124      </body> CR LF
123     </nofram es> CR LF   125     </nofram es> CR LF
124    </framese t> CR LF   126    </framese t> CR LF
125   </html> CR LF   127   </html> CR LF