inquisitio is deprecated

3 files changed, 11 insertions, 8 deletions

diff --git a/doc/index.html.part.in b/doc/index.html.part.in
index 9ee4161b9..79a867869 100644
--- a/doc/index.html.part.in
+++ b/doc/index.html.part.in
@@ -77,11 +77,11 @@ the exheres repository format.</p>
 <p>For users:</p>
 
 <ul>
-    <li><a href="clients/cave.html">cave</a>, the new, improved and not yet entirely feature-complete console package
+    <li><a href="clients/cave.html">cave</a>, the new, improved and modular console package
     management client.</li>
 </ul>
 
-<p>Or for users who prefer to continue using the original clients for now:</p>
+<p>And the old clients, which are being phased out:</p>
 
 <ul>
     <li><a href="clients/paludis.html">paludis</a>, the original console package management client.</li>
diff --git a/src/clients/inquisitio/command_line.cc b/src/clients/inquisitio/command_line.cc
index 582022e86..06002e9d0 100644
--- a/src/clients/inquisitio/command_line.cc
+++ b/src/clients/inquisitio/command_line.cc
@@ -85,6 +85,8 @@ CommandLine::CommandLine() :
     add_usage_line("--help");
 
     add_environment_variable("INQUISITIO_OPTIONS", "Default command-line options.");
+
+    add_note("Inquisitio is deprecated. Use 'cave search' instead.");
 }
 
 std::string
@@ -96,17 +98,15 @@ CommandLine::app_name() const
 std::string
 CommandLine::app_synopsis() const
 {
-    return "A search client for Paludis, the other package mangler";
+    return "A deprecated search client for Paludis, the other package mangler";
 }
 
 std::string
 CommandLine::app_description() const
 {
     return
-        "inquisitio is a search client for Paludis. It can find packages based upon a "
-        "number of different criteria including package name, description and homepage, "
-        "and using a number of different match techniques including simple text match, "
-        "approximate match and regular expression.";
+        "inquisitio is a deprecated search client for Paludis. 'cave search' should be "
+        "used instead.";
 }
 
 CommandLine::~CommandLine()
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 75cda1a14..5ae7983bb 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -64,6 +64,9 @@ main(int argc, char *argv[])
 
     Context context(std::string("In program ") + argv[0] + " " + options + ":");
 
+    Log::get_instance()->message("inquisitio.deprecated", ll_warning, lc_context)
+        << "inquisitio is deprecated. Use 'cave search' instead.";
+
     try
     {
         CommandLine::get_instance()->run(argc, argv, "inquisitio", "INQUISITIO_OPTIONS", "INQUISITIO_CMDLINE");