Collector #17: Fix broken links in StandardCacheManagers help.

Also remove conflict cruft that snuck into CHANGES.txt.

doc/CHANGES.txt

@@ -118,7 +118,8 @@ Zope Changes
       - Collector #266: Retried requests losing track of http request
         headers, causing Connection:Close requests to stall
 
->>>>>>> 1.440
+      - Collector #17: Fixed broken links in StandardCacheManagers help
+
   Zope 2.5.1 beta 1
     
     Bugs Fixed

lib/python/Products/StandardCacheManagers/help/Accel.stx

   Accelerated HTTP Cache Managers
 
     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

lib/python/Products/StandardCacheManagers/help/RAM.stx

   RAM Cache Managers
 
     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