From: adam <adam@megacz.com>
Date: Sun, 18 Apr 2004 02:43:54 +0000 (+0000)
Subject: conflict resolution
X-Git-Tag: 01-July-2005~136
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=ebbcec1cfefe424d92ad83a31ece7a07ddfc7e25;ds=sidebyside

conflict resolution

darcs-hash:20040418024354-5007d-95c2bd9886d315085eb38c9d3519c3e4278cf090.gz
---

diff --git a/doc/reference/reference.xml b/doc/reference/reference.xml
index cd23448..28f8a34 100644
--- a/doc/reference/reference.xml
+++ b/doc/reference/reference.xml
@@ -240,7 +240,6 @@
 
   <section title="Static Code">
 
-v v v v v v v
     If the root [[&lt;ibex&gt;]] element contains any non-whitespace
     text content, this text is interpreted as JavaScript code and is
     executed the first time the template is referenced.  This code is
@@ -256,30 +255,7 @@ v v v v v v v
       and written) from both static scripts as well as instance
       scripts in a particular template. FIXME
       </definition>
-*************
-v v v v v v v
-    If the root <t>&lt;ibex&gt;</t> element contains any non-whitespace
-    text content, this text is interpreted as JavaScript code and is
-    executed the first time the template is referenced.  This code is
-    executed in a fresh scope containing two predefined properties:
-  
-    <definition term="ibex">
-      The Ibex Object (described in <ref section="The Ibex Object"/>)
-      </definition>
-  
-    <definition term="static">
-      A reference to this template's <i>static object</i>, which is
-      initially <t>null</t>.  The static object can be accessed (read
-      and written) from both static scripts as well as instance
-      scripts in a particular template. FIXME
-      </definition>
-*************
-<!-- _______________________________________________________________________ -->
-<section title="Layout and Rendering">
-^ ^ ^ ^ ^ ^ ^
-^ ^ ^ ^ ^ ^ ^
-
-    </section>
+  </section>
   
   <section title="Metadata">
 
@@ -637,7 +613,7 @@ v v v v v v v
       the alignment point of that rectangle of cells.
 
   </section>
-  
+
   <section title="Rendering">
 
     Boxes are rendered in a depth-first, pre-order traversal.  Note that
@@ -2442,5 +2418,5 @@ v v v v v v v
 Copyright (C) 2004 Adam Megacz, verbatim redistribution permitted.
 Ibex is a trademark of Adam Megacz
 **
-    
+
 </ibex-doc>
\ No newline at end of file