commit ebd5200280b7abc71b0471aae2c8c40e1d1f8741
parent 96364b5a2e36ad96d39644e2ae19381735f5f263
Author: W. Trevor King <wking@drexel.edu>
Date: Sun, 23 May 2010 10:06:38 -0400
Remove outdated references to Ferret from docs and comments
Diffstat:
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/HACKING b/HACKING
@@ -8,8 +8,8 @@ Invoke it like this:
You'll have to install all gems mentioned in the Rakefile (look for the line
setting p.extra_deps). If you're on a Debian or Debian-based system (e.g.
Ubuntu), you'll have to make sure you have a complete Ruby installation,
-especially libssl-ruby. You will need libruby-devel, gcc, and make installed
-to build certain gems like Ferret. Gem install does not do a good job of
+especially libssl-ruby. You will need libruby-devel, gcc, and rake installed
+to build certain gems like Xapian. Gem install does not do a good job of
detecting when these things are missing and the build fails.
Rubygems also is particularly aggressive about picking up libraries from
diff --git a/bin/sup-dump b/bin/sup-dump
@@ -10,8 +10,8 @@ $opts = Trollop::options do
Dumps all message state from the sup index to standard out. You can
later use sup-sync --restored --restore <filename> to recover the index.
-This tool is primarily useful in the event that a Ferret upgrade breaks
-the index format. This happened, for example, at Ferret version 0.11.
+This tool is primarily useful in the event that a Xapian upgrade breaks
+the index format.
Usage:
sup-dump > <filename>
diff --git a/doc/FAQ.txt b/doc/FAQ.txt
@@ -63,11 +63,11 @@ A: Run:
sup-sync [<source>+] --restored --restore <dumpfile>
where <dumpfile> was created as above.
-Q: Ferret crashed and I can't read my index. Luckily I made a state
+Q: Xapian crashed and I can't read my index. Luckily I made a state
dump. What should I do?
Q: How do I rebuild the index completely?
A: Run:
- rm -rf ~/.sup/ferret # omg wtf
+ rm -rf ~/.sup/xapian # omg wtf
sup-sync --all-sources --all --restore <dumpfile>
Voila! A brand new index.
diff --git a/doc/NewUserGuide.txt b/doc/NewUserGuide.txt
@@ -146,7 +146,8 @@ press '\' (backslash---forward slash is used for in-buffer search,
following console conventions). Now type in your query (again, Ctrl-G to
cancel at any point.) You can just type in arbitrary text, which will be
matched on a per-word basis against the bodies of all email in the
-index, or you can make use of the full Ferret query syntax:
+index, or you can make use of the full Xapian query syntax
+(http://xapian.org/docs/queryparser.html):
- Phrasal queries using double-quotes, e.g.: "three contiguous words"
- Queries against a particular field using <field name>:<query>,
@@ -161,7 +162,7 @@ You can combine those all together. For example:
label:ruby-talk subject:\[ANN\] -rails on:today
-Play around with the search, and see the Ferret documentation for
+Play around with the search, and see the Xapian documentation for
details on more sophisticated queries (date ranges, "within n words",
etc.)
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
@@ -302,7 +302,7 @@ class String
end
## takes a list of words, and returns an array of symbols. typically used in
- ## Sup for translating Ferret's representation of a list of labels (a string)
+ ## Sup for translating Xapian's representation of a list of labels (a string)
## to an array of label symbols.
##
## split_on will be passed to String#split, so you can leave this nil for space.