[Zope-Checkins] CVS: Zope/lib/python/Products/StandardCacheManagers/help - Accel.stx:1.2 RAM.stx:1.2

[Matt Behrens]

Update of /cvs-repository/Zope/lib/python/Products/StandardCacheManagers/help
In directory cvs.zope.org:/tmp/cvs-serv26162/lib/python/Products/StandardCacheManagers/help

Modified Files:
	Accel.stx RAM.stx 
Log Message:
Collector #17: Fix broken links in StandardCacheManagers help.

Also remove conflict cruft that snuck into CHANGES.txt.



=== Zope/lib/python/Products/StandardCacheManagers/help/Accel.stx 1.1 => 1.2 ===
 
     For background information, see the
-    <a href="../../../OFSP/Help/Caching.stx">description of cache management</a>.
+    <a href="../../OFSP/Help/Caching.stx">description of cache management</a>.
 
     The HTTP protocol provides for headers that can indicate to
     downstream proxy caches, browser caches, and dedicated caches that


=== Zope/lib/python/Products/StandardCacheManagers/help/RAM.stx 1.1 => 1.2 ===
 
     For background information, see the
-    <a href="../../../OFSP/Help/Caching.stx">description of cache management</a>.
+    <a href="../../OFSP/Help/Caching.stx">description of cache management</a>.
 
     The RAM cache manager allows you to cache the result of calling DTML
     methods, Python scripts, and SQL methods in memory.  It allows you