From f1902e624313bd9f34b0e22eb567034242f3c25d Mon Sep 17 00:00:00 2001
From: Aleksandar Petrinic <petrinic@gmail.com>
Date: Wed, 8 Dec 2010 16:02:01 +0100
Subject: Documentation now suggests using cave fix-cache instead of paludis
 --regenerate-*.

---
 doc/overview/gettingstarted.html.part    | 10 ++++------
 paludis/repositories/e/vdb_repository.cc |  4 ++--
 paludis/repository_name_cache.cc         |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/overview/gettingstarted.html.part b/doc/overview/gettingstarted.html.part
index 7bd8d13b1..ee7ead131 100644
--- a/doc/overview/gettingstarted.html.part
+++ b/doc/overview/gettingstarted.html.part
@@ -210,9 +210,8 @@ Paludis ignores.</p>
 <p>The <code>names_cache = </code> option, if set to (for example) <code>/var/cache/paludis/names</code>, can be used to
 make resolving <code>pkg</code> to <code>cat/pkg</code> much faster (a lot less than a second, as opposed to tens of
 seconds on typical hardware). Most users will benefit hugely from this option. However, Portage will not update or use
-this cache, so if for any reason you use Portage for any operation, you must then run <code>paludis
-    --regenerate-installable-cache</code> (and possibly <code>paludis --regenerate-installed-cache</code> if you also
-use caches for VDB as described below). You will also need to force a cache regeneration if you manually (as opposed to
+this cache, so if for any reason you use Portage for any operation, you must then run <code>cave
+fix-cache</code>. You will also need to force a cache regeneration if you manually (as opposed to
 via <code>--sync</code>) modify a repository.</p>
 
 <p>To disable the names cache, use <code>/var/empty</code> as the value.</p>
@@ -234,9 +233,8 @@ provides_cache = (see below)
 <p>The <code>names_cache = </code> option, if set to (for example) <code>/var/cache/paludis/names</code>, can be used to
 make resolving <code>pkg</code> to <code>cat/pkg</code> much faster (a lot less than a second, as opposed to tens of
 seconds on typical hardware). Most users will benefit hugely from this option. However, Portage will not update or use
-this cache, so if for any reason you use Portage for any operation, you must then run <code>paludis
-    --regenerate-installed-cache</code> (and possibly <code>paludis --regenerate-installable-cache</code> if you also
-use caches for other repositories as described above).</p>
+this cache, so if for any reason you use Portage for any operation, you must then run <code>cave
+fix-cache</code>.</p>
 
 <p>The <code>provides_cache = </code> option, if set to (for example) <code>/var/cache/paludis/provides</code>, can be
 used to make resolving an old style virtual to its providers much faster (a lot less of a second, as opposed to anywhere
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index efdb3dc91..ec62c2f08 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -630,7 +630,7 @@ VDBRepository::load_provided_using_cache() const
     {
         Log::get_instance()->message("e.vdb.provides_cache.not_regular_file", ll_warning, lc_no_context)
             << "Provides cache at '" << _imp->params.provides_cache() << "' is not a regular file. Perhaps you need to regenerate "
-            "the cache using 'paludis --regenerate-installed-cache'?";
+            "the cache using 'cave fix-cache'?";
         return false;
     }
 
@@ -643,7 +643,7 @@ VDBRepository::load_provided_using_cache() const
     {
         Log::get_instance()->message("e.vdb.provides_cache.unsupported", ll_warning, lc_no_context) << "Can't use provides cache at '"
             << _imp->params.provides_cache() << "' because format '" << version << "' is not 'paludis-3'. Perhaps you need to regenerate "
-            "the cache using 'paludis --regenerate-installed-cache'?";
+            "the cache using 'cave fix-cache'?";
         return false;
     }
 
diff --git a/paludis/repository_name_cache.cc b/paludis/repository_name_cache.cc
index abf5d1ac3..27e76a810 100644
--- a/paludis/repository_name_cache.cc
+++ b/paludis/repository_name_cache.cc
@@ -92,7 +92,7 @@ Imp<RepositoryNameCache>::find(const PackageNamePart & p) const
                     Log::get_instance()->message("repository.names_cache.unsupported", ll_warning, lc_context)
                         << "Names cache for '" << repo->name() << "' has version string '" << line
                         << "', which is not supported. Was it generated using a different Paludis version? Perhaps you need to regenerate "
-                        "the cache using 'paludis --regenerate-installed-cache' or 'paludis --regenerate-installable-cache'?";
+                        "the cache using 'cave fix-cache'?";
                     usable = false;
                     return name_cache_map.end();
                 }
@@ -125,7 +125,7 @@ Imp<RepositoryNameCache>::find(const PackageNamePart & p) const
                     << "Names cache for '" << repo->name()
                     << "' has no version information, so cannot be used. Either it was generated using "
                     "an older Paludis version or it has not yet been generated. Perhaps you need to regenerate "
-                    "the cache using 'paludis --regenerate-installed-cache' or 'paludis --regenerate-installable-cache'?";
+                    "the cache using 'cave fix-cache'?";
                 usable = false;
                 return name_cache_map.end();
             }
-- 
cgit v1.2.3