Author: crossley
Date: Tue Dec 17 06:05:15 2013
New Revision: 1551468

URL: http://svn.apache.org/r1551468
Log:
Use consistent names for project sitemap entities.
Issue: FOR-1245

Modified:
    forrest/trunk/main/webapp/sitemap.xmap
    forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml

Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1551468&r1=1551467&r2=1551468&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Tue Dec 17 06:05:15 2013
@@ -641,6 +641,6 @@ $Revision: 1.12 $
       </map:match>
     </map:pipeline>
 <!-- Enable Cocoon error handling. See FOR-1245. -->
-  &handle-errors;
+  &sitemap-handle-errors;
   </map:pipelines>
 </map:sitemap>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml?rev=1551468&r1=1551467&r2=1551468&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Tue Dec 17 
06:05:15 2013
@@ -1329,12 +1329,12 @@ X [0]         /docs_0_80/upgrading_08.ht
           <code>webapp/sitemap.xmap</code> file.
         </p>
         <p>
-          Do this by adding a "handle-errors" xml entity to your project
+          Do this by adding a "sitemap-handle-errors" xml entity to your 
project
           "symbols" file (<link href="#sitemap-entities">explained 
above</link>).
           For example:
         </p>
         <source>
-<![CDATA[<!ENTITY handle-errors '
+<![CDATA[<!ENTITY sitemap-handle-errors '
      <map:handle-errors>
       <map:select type="exception">
        <map:when test="resourceNotFound">