67. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 16 22:30:05 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 Thu Oct 16 22:30:05 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Wiki - MediaWiki\Pages Page.asp Mon Oct 13 05:52:00 2008 UTC

67.2 Comparison summary

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

67.3 Comparison options

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

67.4 Active regular expressions

No regular expressions were active.

67.5 Comparison detail

        1   <?xml vers ion="1.0"  encoding=" utf-8"?>
        2   <div xmlns ="http://w ww.w3.org/ 1999/xhtml " xmlns:ww page="urn: WebWorks-P age-Templa te-Schema"  xmlns:wwe xsldoc="ur n:WebWorks -XSLT-Exte nsion-Docu ment" xml: lang="en"  wwpage:att ribute-xml -lang="loc ale" lang= "en" wwpag e:attribut e-lang="lo cale" styl e="text-al ign: left; " wwpage:a ttribute-s tyle="body -style">
        3     <table w wpage:cond ition="com pany-info- top" align ="left" ww page:attri bute-align ="company- info-top-a lignment"  summary="" >
        4       <tr ww page:condi tion="comp any-logo-s rc-exists" >
        5         <td  style="tex t-align: l eft;">
        6           <w wpage:bloc k wwpage:c ondition=" company-li nk-exists" >
        7              [[<wwpage: inline wwp age:replac e="wwattri bute:src"  src="image s/logo.gif " wwpage:a ttribute-s rc="compan y-logo-src " />|<wwpa ge:inline  wwpage:rep lace="comp any-name"> Company Na me</wwpage :inline>]]  
        8           </ wwpage:blo ck>
        9           
        10           <w wpage:bloc k wwpage:c ondition=" company-li nk-not-exi sts">
        11              [[<wwpage: inline wwp age:replac e="wwattri bute:src"  src="image s/logo.gif " wwpage:a ttribute-s rc="compan y-logo-src " />|<wwpa ge:inline  wwpage:rep lace="comp any-name"> Company Na me</wwpage :inline>]]
        12           </ wwpage:blo ck>
        13         </td >
        14       </tr>
        15  
        16       <tr ww page:condi tion="comp any-name-e xists">
        17         <td  style="tex t-align: l eft; font- size: 16px ; font-wei ght: bold; ">
        18           <w wpage:bloc k wwpage:c ondition=" company-li nk-exists"
        19              [[<wwpage: inline wwp age:replac e="company -link">htt p://www.we bworks.com /</wwpage: inline>|<w wpage:inli ne wwpage: replace="c ompany-nam e">Company  Name</wwp age:inline >]] 
        20           </ wwpage:blo ck> 
        21           
        22           <w wpage:bloc k wwpage:c ondition=" company-li nk-not-exi sts"> 
        23              <wwpage:in line wwpag e:replace= "company-n ame">Compa ny Name</w wpage:inli ne> 
        24           </ wwpage:blo ck>
        25         </td >
        26       </tr>
        27  
        28       <tr ww page:condi tion="comp any-phone- exists">
        29         <td  style="tex t-align: l eft; font- size: 12px ;" wwpage: content="c ompany-pho ne">
        30           Ph one: 512-5 55-1234
        31         </td >
        32       </tr>
        33  
        34       <tr ww page:condi tion="comp any-fax-ex ists">
        35         <td  style="tex t-align: l eft; font- size: 12px ;" wwpage: content="c ompany-fax ">
        36           Fa x: 512-555 -5678
        37         </td >
        38       </tr>
        39  
        40       <tr ww page:condi tion="comp any-email- exists">
        41         <td  style="tex t-align: l eft; font- size: 16px ; font-wei ght: bold; ">
        42           [[ <wwpage:in line wwpag e:replace= "company-e mail-href"  />|<wwpag e:inline w wpage:repl ace="compa ny-email"  />]]
        43         </td >
        44       </tr>
        45     </table>
        46  
        47   <div wwpag e:conditio n="navigat ion-top" s tyle="text -align: ri ght;" wwpa ge:attribu te-style=" navigation -top-style ">
        48   <wwpage:in line wwpag e:conditio n="navigat ion-toc-cu rrent" wwp age:replac e="navigat ion-toc-ti tle">Table  of Conten ts</wwpage :inline><w wpage:inli ne wwpage: condition= "navigatio n-toc-not- current">[ [<wwpage:i nline wwpa ge:replace ="navigati on-toc-lin k" />|<wwp age:inline  wwpage:re place="nav igation-to c-title">T able of Co ntents</ww page:inlin e>]]</wwpa ge:inline> <wwpage:in line wwpag e:conditio n="navigat ion-previo us-exists" > | [[<wwp age:inline  wwpage:re place="nav igation-pr evious-lin k" />|<wwp age:inline  wwpage:re place="nav igation-pr evious-tit le">Previo us</wwpage :inline>]] </wwpage:i nline><wwp age:inline  wwpage:co ndition="n avigation- previous-n ot-exists" > | <wwpag e:inline w wpage:repl ace="navig ation-prev ious-title ">Previous </wwpage:i nline></ww page:inlin e><wwpage: inline wwp age:condit ion="navig ation-next -exists">  | [[<wwpag e:inline w wpage:repl ace="navig ation-next -link" />| <wwpage:in line wwpag e:replace= "navigatio n-next-tit le">Next</ wwpage:inl ine>]]</ww page:inlin e><wwpage: inline wwp age:condit ion="navig ation-next -not-exist s"> | <wwp age:inline  wwpage:re place="nav igation-ne xt-title"> Next</wwpa ge:inline> </wwpage:i nline><wwp age:inline  wwpage:co ndition="n avigation- index-curr ent"> | <w wpage:inli ne wwpage: replace="n avigation- index-titl e">Index</ wwpage:inl ine></wwpa ge:inline> <wwpage:in line wwpag e:conditio n="navigat ion-index- not-curren t"> | [[<w wpage:inli ne wwpage: replace="n avigation- index-link " />|<wwpa ge:inline  wwpage:rep lace="navi gation-ind ex-title"> Index</wwp age:inline >]]</wwpag e:inline>< wwpage:inl ine wwpage :condition ="pdf-exis ts"> | [[< wwpage:inl ine wwpage :replace=" pdf-link"  />|<wwpage :inline ww page:repla ce="naviga tion-pdf-t itle">Prin t</wwpage: inline>]]< /wwpage:in line>
        49   </div>
        50  
        51     <div wwp age:condit ion="bread crumbs-top " wwpage:c ontent="br eadcrumbs"  style="te xt-align:  left;" wwp age:attrib ute-style= "breadcrum bs-top-sty le">
        52       Breadc rumbs go h ere
        53     </div>
        54  
        55     <hr wwpa ge:conditi on="header -exists" /
        56  
        57     <wwpage: block wwpa ge:replace ="content"
        58       Page c ontent wit h header/f ooter.
        59     </wwpage :block>
        60  
        61     <hr wwpa ge:conditi on="footer -exists" / >
        62  
        63     <div wwp age:condit ion="bread crumbs-bot tom" wwpag e:content= "breadcrum bs" style= "text-alig n: left;"  wwpage:att ribute-sty le="breadc rumbs-bott om-style">
        64       Breadc rumbs go h ere
        65     </div>
        66  
        67   <div wwpag e:conditio n="navigat ion-bottom " style="t ext-align:  right;" w wpage:attr ibute-styl e="navigat ion-bottom -style">
        68   <wwpage:in line wwpag e:conditio n="navigat ion-toc-cu rrent" wwp age:replac e="navigat ion-toc-ti tle">Table  of Conten ts</wwpage :inline><w wpage:inli ne wwpage: condition= "navigatio n-toc-not- current">[ [<wwpage:i nline wwpa ge:replace ="navigati on-toc-lin k" />|<wwp age:inline  wwpage:re place="nav igation-to c-title">T able of Co ntents</ww page:inlin e>]]</wwpa ge:inline> <wwpage:in line wwpag e:conditio n="navigat ion-previo us-exists" > | [[<wwp age:inline  wwpage:re place="nav igation-pr evious-lin k" />|<wwp age:inline  wwpage:re place="nav igation-pr evious-tit le">Previo us</wwpage :inline>]] </wwpage:i nline><wwp age:inline  wwpage:co ndition="n avigation- previous-n ot-exists" > | <wwpag e:inline w wpage:repl ace="navig ation-prev ious-title ">Previous </wwpage:i nline></ww page:inlin e><wwpage: inline wwp age:condit ion="navig ation-next -exists">  | [[<wwpag e:inline w wpage:repl ace="navig ation-next -link" />| <wwpage:in line wwpag e:replace= "navigatio n-next-tit le">Next</ wwpage:inl ine>]]</ww page:inlin e><wwpage: inline wwp age:condit ion="navig ation-next -not-exist s"> | <wwp age:inline  wwpage:re place="nav igation-ne xt-title"> Next</wwpa ge:inline> </wwpage:i nline><wwp age:inline  wwpage:co ndition="n avigation- index-curr ent"> | <w wpage:inli ne wwpage: replace="n avigation- index-titl e">Index</ wwpage:inl ine></wwpa ge:inline> <wwpage:in line wwpag e:conditio n="navigat ion-index- not-curren t"> | [[<w wpage:inli ne wwpage: replace="n avigation- index-link " />|<wwpa ge:inline  wwpage:rep lace="navi gation-ind ex-title"> Index</wwp age:inline >]]</wwpag e:inline>< wwpage:inl ine wwpage :condition ="pdf-exis ts"> | [[< wwpage:inl ine wwpage :replace=" pdf-link"  />|<wwpage :inline ww page:repla ce="naviga tion-pdf-t itle">Prin t</wwpage: inline>]]< /wwpage:in line>
        69   </div>
        70     
        71     <table w wpage:cond ition="com pany-info- top" align ="left" ww page:attri bute-align ="company- info-top-a lignment"  summary="" >
        72       <tr ww page:condi tion="comp any-logo-s rc-exists" >
        73         <td  style="tex t-align: l eft;">
        74           <w wpage:bloc k wwpage:c ondition=" company-li nk-exists" >
        75              [[<wwpage: inline wwp age:replac e="wwattri bute:src"  src="image s/logo.gif " wwpage:a ttribute-s rc="compan y-logo-src " />|<wwpa ge:inline  wwpage:rep lace="comp any-name"> Company Na me</wwpage :inline>]]  
        76           </ wwpage:blo ck>
        77           
        78           <w wpage:bloc k wwpage:c ondition=" company-li nk-not-exi sts">
        79              [[<wwpage: inline wwp age:replac e="wwattri bute:src"  src="image s/logo.gif " wwpage:a ttribute-s rc="compan y-logo-src " />|<wwpa ge:inline  wwpage:rep lace="comp any-name"> Company Na me</wwpage :inline>]]
        80           </ wwpage:blo ck>
        81         </td >
        82       </tr>
        83       
        84       <tr ww page:condi tion="comp any-name-e xists">
        85         <td  style="tex t-align: l eft; font- size: 16px ; font-wei ght: bold; ">
        86           <w wpage:bloc k wwpage:c ondition=" company-li nk-exists"
        87              [[<wwpage: inline wwp age:replac e="company -link">htt p://www.we bworks.com /</wwpage: inline>|<w wpage:inli ne wwpage: replace="c ompany-nam e">Company  Name</wwp age:inline >|target=e xternal_wi ndow]] 
        88           </ wwpage:blo ck> 
        89           
        90           <w wpage:bloc k wwpage:c ondition=" company-li nk-not-exi sts"> 
        91              <wwpage:in line wwpag e:replace= "company-n ame">Compa ny Name</w wpage:inli ne> 
        92           </ wwpage:blo ck>
        93         </td >
        94       </tr>
        95       
        96       <tr ww page:condi tion="comp any-phone- exists">
        97         <td  style="tex t-align: l eft; font- size: 12px ;" wwpage: content="c ompany-pho ne">
        98           Ph one: 512-5 55-1234
        99         </td >
        100       </tr>
        101       
        102       <tr ww page:condi tion="comp any-fax-ex ists">
        103         <td  style="tex t-align: l eft; font- size: 12px ;" wwpage: content="c ompany-fax ">
        104           Fa x: 512-555 -5678
        105         </td >
        106       </tr>
        107       
        108       <tr ww page:condi tion="comp any-email- exists">
        109         <td  style="tex t-align: l eft; font- size: 16px ; font-wei ght: bold; ">
        110           [[ <wwpage:in line wwpag e:replace= "company-e mail-href"  />|<wwpag e:inline w wpage:repl ace="compa ny-email"  />]]
        111         </td >
        112       </tr>
        113     </table>
        114  
        115   </div>