Author: bdube
Date: Sat Jul 19 14:47:03 2008
New Revision: 678226

URL: http://svn.apache.org/viewvc?rev=678226&view=rev
Log:
Revert r678131 and r678132 for discussion

Removed:
    
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/xinclude-explanation.xml
    
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/xinclude-input-sec2.xml
    
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/xinclude.xml
Modified:
    
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/index.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml

Modified: 
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/index.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/index.xml?rev=678226&r1=678225&r2=678226&view=diff
==============================================================================
--- 
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/index.xml
 (original)
+++ 
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/index.xml
 Sat Jul 19 14:47:03 2008
@@ -47,7 +47,6 @@
               <li><a href="site:docs-samples1/sample-usemap">Usemap</a> 
Interactive client-side imagemaps - the usemap attribute.</li>
               <li><a href="site:docs-samples1/sample-custom">Custom Schema</a> 
Contains a custom schema example.</li>
               <li><a href="site:docs-samples1/xml-entities">XML Entities</a> 
Using XML entities for character replacements.</li>
-              <li><a href="site:docs-samples1/xinclude">XInclude</a> An 
example of using XInclude, using two files included into another</li>
               <li><a href="site:docs-samples1/faq">FAQ</a> Frequently Asked 
Questions.</li>
               <li><a href="site:docs-samples1/locationmap">Locationmap</a> An 
introduction and examples of using the Locationmap.</li>
 

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml?rev=678226&r1=678225&r2=678226&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml 
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml Sat 
Jul 19 14:47:03 2008
@@ -68,8 +68,7 @@
         description="Custom XML schema and doctypes"/>
       <custom-example href="custom.html" description="A custom XML file"/>
       <xml-entities label="XML entities" href="xml-entities.html"
-              description="Using XML entities for character replacements"/>
-      <xinclude label="xinclude" href="xinclude.html" description="Test of 
Xinclude"/>
+        description="Using XML entities for character replacements"/>
       <faq label="FAQ" href="faq.html" description="Frequently Asked 
Questions"/>
       <locationmap label="Locationmap" href="locationmap/index.html"
         description="Locationmaps allow the user URL space to be different 
from the storage URL Space"/>