29. Araxis Merge File Comparison Report

Produced by Araxis Merge on Sat May 2 08:30:16 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.

29.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\allums\Desktop\2008.4\Formats\WebWorks Help 5.0\Files\wwhelp\wwhimpl api.htm Mon Jan 19 18:02:40 2009 UTC
2 C:\Documents and Settings\allums\Desktop\2009.1\Formats\WebWorks Help 5.0\Files\wwhelp\wwhimpl api.htm Sat May 2 06:55:40 2009 UTC

29.2 Comparison summary

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

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

29.4 Active regular expressions

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

29.5 Comparison detail

1   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Trans itional//E N" "http:/ /www.w3.or g/TR/xhtml 1/DTD/xhtm l1-transit ional.dtd" >   1   <!DOCTYPE  html PUBLI C "-//W3C/ /DTD XHTML  1.0 Trans itional//E N" "http:/ /www.w3.or g/TR/xhtml 1/DTD/xhtm l1-transit ional.dtd" >
2   <html>   2   <html>
3    <!-- Copy right (c)  2000-2008  Quadralay  Corporatio n.  All ri ghts reser ved. -->   3    <!-- Copy right (c)  2000-2008  Quadralay  Corporatio n.  All ri ghts reser ved. -->
4     4  
5    <head>   5    <head>
6     <title>W ebWorks He lp 5.0</ti tle>   6     <title>W ebWorks He lp 5.0</ti tle>
7     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml">   7     <meta ht tp-equiv=" content-ty pe" conten t="text/ht ml">
8     <meta ht tp-equiv=" charset"       conten t="UTF-8">   8     <meta ht tp-equiv=" charset"       conten t="UTF-8">
9     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet -->   9     <!-- MOT W-DISABLED  saved fro m url=(001 4)about:in ternet -->
10     10  
11     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="common/ private/ti tle.js"></ script>   11     <script  type="text /javascrip t" languag e="JavaScr ipt1.2" sr c="common/ private/ti tle.js"></ script>
12     12  
13     <script  type="text /javascrip t" languag e="JavaScr ipt1.2">   13     <script  type="text /javascrip t" languag e="JavaScr ipt1.2">
14      <!--   14      <!--
15       functi on  WWHHel pFrame_Lau nchHelp()   15       functi on  WWHHel pFrame_Lau nchHelp()
16       {   16       {
17         var   Parameter s;   17         var   Parameter s;
18         var   Parts;   18         var   Parts;
19     19  
20         // P rocess URL  parameter s   20         // P rocess URL  parameter s
21         //   21         //
22         Para meters = " ";   22         Para meters = " ";
23         if ( location.h ref.indexO f("?") !=  -1)   23         if ( location.h ref.indexO f("?") !=  -1)
24         {   24         {
25           Pa rts = loca tion.href. split("?") ;   25           Pa rts = loca tion.href. split("?") ;
26           Pa rameters =  "?" + Par ts[1];   26           Pa rameters =  "?" + Par ts[1];
27         }   27         }
28         else  if (locat ion.href.i ndexOf("#" ) != -1)   28         else  if (locat ion.href.i ndexOf("#" ) != -1)
29         {   29         {
30           Pa rts = loca tion.href. split("#") ;   30           Pa rts = loca tion.href. split("#") ;
31           Pa rameters =  "#" + Par ts.slice(1 ).join("#" );   31           Pa rameters =  "#" + Par ts.slice(1 ).join("#" );
32         }   32         }
33     33  
34         setT imeout("lo cation.rep lace(\" common / html / s w itc h
.htm" + Pa rameters +  "\");", 1 );
  34         setT imeout("lo cation.rep lace(\" .. / .. /
w w h sec .htm" + Pa rameters +  "\");", 1 );
35       }   35       }
36      // -->   36      // -->
37     </script >   37     </script >
38    </head>   38    </head>
39     39  
40    <body onl oad="WWHHe lpFrame_La unchHelp() ;">   40    <body onl oad="WWHHe lpFrame_La unchHelp() ;">
41    </body>   41    </body>
42   </html>   42   </html>