67. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Nov 21 17:21:51 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.

67.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\allums\Desktop\2008.1.20396.b\Formats\WebWorks Help 5.0\Files\wwhelp\wwhimpl\common\html frameset.htm Fri Sep 7 17:51:30 2007 UTC
2 C:\Documents and Settings\allums\Desktop\2008.2.20597.p2\Formats\WebWorks Help 5.0\Files\wwhelp\wwhimpl\common\html frameset.htm Fri Jul 4 06:51:22 2008 UTC

67.2 Comparison summary

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

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

67.4 Active regular expressions

Expression Description
\$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments

67.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">   1   <!DOCTYPE  HTML PUBLI C "-//W3C/ /DTD HTML  4.0 Frames et//EN" "h ttp://www. w3.org/TR/ REC-html40 /frameset. dtd">
2   <html>   2   <html>
3    <!-- Copy right (c)  2000-2006  Quadralay  Corporatio n.  All ri ghts reser ved. -->   3    <!-- Copy right (c)  2000-2006  Quadralay  Corporatio n.  All ri ghts reser ved. -->
4     4  
5    <head>   5    <head>
6     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml">   6     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml">
7     <meta ht tp-equiv=" charset"       conten t="UTF-8">   7     <meta ht tp-equiv=" charset"       conten t="UTF-8">
8     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet -->   8     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet -->
9     9  
10     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/title. js"></scri pt>   10     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="../priv ate/title. js"></scri pt>
11     11  
12     <script  type="text /javascrip t" languag e="JavaScr ipt1.2">   12     <script  type="text /javascrip t" languag e="JavaScr ipt1.2">
13      <!--   13      <!--
14       // Set  reference  to top le vel help f rame   14       // Set  reference  to top le vel help f rame
15       //   15       //
16       var  W WHFrameRef erence = " window.fra mes[1]";   16       var  W WHFrameRef erence = " window.fra mes[1]";
17       var  W WHFrame;   17       var  W WHFrame;
18     18  
19          
20       functi on  WWHFra meset_Hand leLoad()   19       functi on  WWHFra meset_Hand leLoad()
21       {   20       {
22         var   Parameter s;   21         var   Parameter s;
23         var   Parts;   22         var   Parts;
24     23  
25          
26         // S et referen ce to top  level help  frame   24         // S et referen ce to top  level help  frame
27         //   25         //
28         WWHF rame = eva l(WWHFrame Reference) ;   26         WWHF rame = eva l(WWHFrame Reference) ;
29     27  
30         // P rocess URL  parameter s   28         // P rocess URL  parameter s
31         //   29         //
32         Para meters = " ";   30         Para meters = " ";
33         if ( location.h ref.indexO f("?") !=  -1)   31         if ( location.h ref.indexO f("?") !=  -1)
34         {   32         {
35           Pa rts = loca tion.href. split("?") ;   33           Pa rts = loca tion.href. split("?") ;
36           Pa rameters =  "?" + Par ts[1];   34           Pa rameters =  "?" + Par ts[1];
37         }   35         }
38         else  if (locat ion.href.i ndexOf("#" ) != -1)   36         else  if (locat ion.href.i ndexOf("#" ) != -1)
39         {   37         {
40           Pa rts = loca tion.href. split("#") ;   38           Pa rts = loca tion.href. split("#") ;
41           Pa rameters =  "#" + Par ts [ 1 ] ;   39           Pa rameters =  "#" + Par ts .slice( 1 ).join("#" ) ;
42         }   40         }
43     41  
44         setT imeout(WWH FrameRefer ence + ".l ocation.re place(\"sw itch.htm"  + Paramete rs + "\"); ", 1);   42         setT imeout(WWH FrameRefer ence + ".l ocation.re place(\"sw itch.htm"  + Paramete rs + "\"); ", 1);
45       }   43       }
46     44  
47       // Net scape Resi ze Fix   45       // Net scape Resi ze Fix
48       //   46       //
49       functi on  WWHFra meset_Hand leResize()   47       functi on  WWHFra meset_Hand leResize()
50       {   48       {
51         if ( WWHFrame.W WHBrowser. mBrowser = = 1)  // S horthand f or Netscap e   49         if ( WWHFrame.W WHBrowser. mBrowser = = 1)  // S horthand f or Netscap e
52         {   50         {
53           WW HFrame.WWH ContentFra me_ReloadL ocation("W WHDocument Frame");   51           WW HFrame.WWH ContentFra me_ReloadL ocation("W WHDocument Frame");
54         }   52         }
55       }   53       }
56     54  
57       functi on  WWHFra meset_Hand leKeyDown( ParamEvent )   55       functi on  WWHFra meset_Hand leKeyDown( ParamEvent )
58       {   56       {
59         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyDow n(ParamEve nt);   57         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyDow n(ParamEve nt);
60       }   58       }
61     59  
62       functi on  WWHFra meset_Hand leKeyPress (ParamEven t)   60       functi on  WWHFra meset_Hand leKeyPress (ParamEven t)
63       {   61       {
64         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyPre ss(ParamEv ent);   62         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyPre ss(ParamEv ent);
65       }   63       }
66     64  
67       functi on  WWHFra meset_Hand leKeyUp(Pa ramEvent)   65       functi on  WWHFra meset_Hand leKeyUp(Pa ramEvent)
68       {   66       {
69         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyUp( ParamEvent );   67         retu rn WWHFram e.WWHConte ntFrame_Ha ndleKeyUp( ParamEvent );
70       }   68       }
71      // -->   69      // -->
72     </script >   70     </script >
73    </head>   71    </head>
74     72  
75    <frameset  rows="300 ,*" border ="0" frame border="0"  framespac ing="0" on load="WWHF rameset_Ha ndleLoad() ;" onresiz e="WWHFram eset_Handl eResize(); " onkeydow n="WWHFram eset_Handl eKeyDown(( document.a ll||docume nt.getElem entById||d ocument.la yers)?even t:null);"  onkeypress ="WWHFrame set_Handle KeyPress(( document.a ll||docume nt.getElem entById||d ocument.la yers)?even t:null);"  onkeyup="W WHFrameset _HandleKey Up((docume nt.all||do cument.get ElementByI d||documen t.layers)? event:null );">   73    <frameset  rows="300 ,*" border ="0" frame border="0"  framespac ing="0" on load="WWHF rameset_Ha ndleLoad() ;" onresiz e="WWHFram eset_Handl eResize(); " onkeydow n="WWHFram eset_Handl eKeyDown(( document.a ll||docume nt.getElem entById||d ocument.la yers)?even t:null);"  onkeypress ="WWHFrame set_Handle KeyPress(( document.a ll||docume nt.getElem entById||d ocument.la yers)?even t:null);"  onkeyup="W WHFrameset _HandleKey Up((docume nt.all||do cument.get ElementByI d||documen t.layers)? event:null );">
76     <frame n ame="" src ="blank.ht m" scrolli ng="no">   74     <frame n ame="" src ="blank.ht m" scrolli ng="no">
77     <frame n ame="" src ="blank.ht m" scrolli ng="no">   75     <frame n ame="" src ="blank.ht m" scrolli ng="no">
78     76  
79     <noframe s>   77     <noframe s>
80      <body>   78      <body>
81       <p>Thi s page use s frames,  but your b rowser doe sn't suppo rt them.</ p>   79       <p>Thi s page use s frames,  but your b rowser doe sn't suppo rt them.</ p>
82      </body>   80      </body>
83     </nofram es>   81     </nofram es>
84    </framese t>   82    </framese t>
85   </html>   83   </html>