rroonga 1.3.0-x86-mingw32 → 1.3.1-x86-mingw32

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/drilldown.txt

@@ -5,9 +5,7 @@
 .. groonga-include : search.txt
 
 .. groonga-command
-.. table_remove SiteDomain
-.. table_remove SiteCountry
-
+.. database: tutorial
 
 ドリルダウン
 ============

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/index.txt

@@ -3,8 +3,9 @@
 .. highlightlang:: none
 
 .. groonga-include : drilldown.txt
+
 .. groonga-command
-.. table_remove GeoIndex
+.. database: tutorial
 
 タグ検索・参照関係の逆引き
 ==========================

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/introduction.txt

@@ -4,176 +4,164 @@
 
 .. groonga-command
 .. database: tutorial
-.. table_remove Site
-.. table_remove Terms
 
-Fundamental operation
-=====================
+Basic operations
+================
 
-You can use groonga as a library of programming language C or an executable file.
-This tutorial explains how to use groonga as an executable file.
-Using its file, you can create and operate databases, start and connect to server, and so on.
+The groonga package provides a C library (libgroonga) and a command line tool (groonga). This tutorial explains how to use the groonga command, with which you can create/operate databases, start a server, establish a connection with a server, etc.
 
-Create database
----------------
+Create a database
+-----------------
 
-You can create a new database in the following command.
+You can create a new database with the following command.
 
-Form ::
+Form::
 
   groonga -n DB_PATH_NAME
 
-'-n' option specifies to create a database. DB_PATH_NAME specifies full-path of new database.
+The '-n' option specifies to create a new database. DB_PATH_NAME specifies the path of the new database. Note that this command fails if the specified path already exists.
 
-Groonga starts as interactive mode after you create a database with this command, and so groonga accepts commands from standard input. This mode is terminated with Ctrl-d.
+This command creates a database and then enters into interactive mode in which groonga prompts you to enter commands for operating that database. You can terminate this mode with Ctrl-d.
 
 Execution example::
 
   % groonga -n /tmp/tutorial.db
-  > ctrl-d
+  > Ctrl-d
   %
 
-Operate database
-----------------
+Operate a database
+------------------
 
-Form ::
+Form::
 
   groonga DB_PATH_NAME [COMMAND]
 
-DB_PATH_NAME specifies full-path of existing database.
-If COMMAND is specified, result of COMMAND is returned.
+DB_PATH_NAME specifies the path of a target database.
 
-With no COMMAND, this command starts groonga as interactive-mode.
-Groonga of this mode reads a command from standard input evaluates it repeatedly.
-This tutorial uses interactive-mode mainly.
+If COMMAND is specified, groonga executes COMMAND and returns the result. Otherwise, groonga starts in interactive mode that reads commands from the standard input and execute them one by one. This tutorial focuses on the interactive mode.
 
-For example, we will run the `status` command.
-This command returns status of groonga's execution.
+Let's try to see the status of a groonga process by using a :doc:`/commands/status` command.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-1.log
 .. .. % groonga -n /tmp/groonga-databases/introduction.db
 .. status
 
-The mentioned above, results of executed commands are generally JSON style.
-The first element in a array of JSON has information of error-code, execution time, and so on.
-The second element has a result of exectuted command.
+As shown in the above example, a command basically returns a JSON array. The first element contains an error code, execution time, etc. The second element is the result of an operation.
 
-Commands
---------
+Command format
+--------------
 
-You can operate database with various commands via execution file of groonga or groonga server.
-There are forms of commands in the following::
+Commands for operating a database accept arguments as follows::
 
- Form1: COMMAND ARGUMENT1 ARGUMENT2 ..
+ Form_1: COMMAND VALUE_1 VALUE_2 ..
 
- Form2: COMMAND --ARAGUMENT1 VALUE1 --ARGUMENT2 VALUE2 ..
+ Form_2: COMMAND --NAME_1 VALUE_1 --NAME_2 VALUE_2 ..
 
-You can mix these forms in commands running.
+In the first form, arguments must be passed in order. This kind of arguments are called positional arguments because the position of each argument determines its meaning.
 
-In Form2, if you want to specify a value including some spaces or symbols("'()/), you should enclose its value with single-quote or double-quote.
+In the second form, you can specify a parameter name with its value. So, the order of arguments is not defined. This kind of arguments are known as named parameters or keyword arguments.
 
-For detail, you can see paragraph of "command" in :doc:`/executables/groonga`.
+If you want to specify a value which contains white-spaces or special characters, such as quotes and parentheses, please enclose the value with single-quotes or double-quotes.
 
-Basicaly commands
------------------
+For details, see also the paragraph of "command" in :doc:`/executables/groonga`.
+
+Basic commands
+--------------
 
  :doc:`/commands/status`
-  Show status of groonga process.
+  shows status of a groonga process.
  :doc:`/commands/table_list`
-  Show lists of tables defined in a database.
+  shows a list of tables in a database.
  :doc:`/commands/column_list`
-  Show lists of columns defined in a table.
+  shows a list of columns in a table.
  :doc:`/commands/table_create`
-  Add table to a database.
+  adds a table to a database.
  :doc:`/commands/column_create`
-  Add column to a table.
+  adds a column to a table.
  :doc:`/commands/select`
-  Search and show records included a table.
+  searches records from a table and shows the result.
  :doc:`/commands/load`
-  Insert record to a table.
+  inserts records to a table.
 
-Create table
-------------
+Create a table
+--------------
 
-:doc:`/commands/table_create` creates table.
+A :doc:`/commands/table_create` command creates a table.
 
-In using groonga, to creating tables generally needed master key.
-Master key should be specified the types and the way to store.
+In most cases, a table of groonga has a primary key which must be specified with its data type and index type. 
 
-We're going to explain the types in tutorial after.
-Please imagine it as expressing sort of data.
-How to store master key defines speed of search with master key and advisability of begins-with-match search. This is also explained in this tutorial later.
+There are various data types such as integers, floating-point numbers, etc. The index type determines the search performance and the availability of prefix searches. We will explain the details later.
 
-For example, we create 'Site' table. This table has master key of ShortText type, and the way to store its key is HASH.
+Let's create a 'Site' table which has a primary key of ShortText. In this example, the index type is HASH.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-2.log
 .. table_create --name Site --flags TABLE_HASH_KEY --key_type ShortText
 
-Search
-------
+View a table
+------------
 
-:doc:`/commands/select` shows contents of table.
+A :doc:`/commands/select` command shows contents of table.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-3.log
 .. select --table Site
 
-With name of a table, 'select' command shows 10 contents of its table. [0] shows the number of searched records. ["_id","Uint32"] is column named "_id" and type of this column's value is UInt32. ["_key","ShortText"] is "_key" column, type of this column's value is ShortText.
+When only a table is specified, the 'select' command returns the first (at most) 10 records of that table. "[0]" in the result shows the number of records in the 'Site' table. The next array is a list of columns. ["_id","Uint32"] is a column of UInt32, named "_id". ["_key","ShortText"] is a column of ShortText, named "_key".
 
-'table_create' command creates table including two columns, '_id' and '_key' first. '_id' has ID-number given automatically by groonga. '_key' column is stored master key. You cannot modify this column's name.
+The above two columns, '_id' and '_key', are the necessary columns. The '_id' column stores IDs those are automatically allocated by groonga. The '_key' column is associated with the primary key. You are not allowed to rename these columns.
 
-Create columns
---------------
+Create a column
+---------------
 
-:doc:`/commands/column_create` command create columns.
+A :doc:`/commands/column_create` command adds a column to a table.
 
-We add a column named 'comment' that lets us store value whose type is ShortText.
+Let's add a column of ShortText to store titles. You may give a descriptive name 'title' to the column.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-4.log
 .. column_create --table Site --name title --flags COLUMN_SCALAR --type ShortText
 .. select --table Site
 
-COLUMN_SCALAR means this is normal column.
+The COLUMN_SCALAR flag specifies to add a regular column.
 
-Create terminology table with fulltext-searching
-------------------------------------------------
+Create a lexicon table for full text searches
+---------------------------------------------
 
-This tutorial explains fulltext searching with entried data in groonga table.
+Let's go on to how to make a full text search.
 
-We need terminology table in fulltext-searching.
-Terminology table is a table whose master key's values are words in text.
-We create 'Terms' table, it has type of master key value is ShortText.
+Groonga uses an inverted index to provide fast full text search. So, the first step is to create a lexicon table which stores an inverted index, also known as postings lists. The primary key of this table is associated with a vocabulary made up of index terms and each record stores postings lists for one index term.
+
+The following shows a command which creates a lexicon table named 'Terms'. The data type of its primary key is ShortText.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-5.log
 .. table_create --name Terms --flags TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText --default_tokenizer TokenBigram
 
-Many parameters is specified in this execution example.
-You don't hove to understand all parameters.
-There are the simple explaination, but you can skipped.
+The table_create command takes many parameters but you don't need to understand all of them. Please skip the next paragraph if you are not interested in how it works.
+
+The 'TABLE_PAT_KEY' flag specifies to store index terms in a patricia trie. The 'KEY_NORMALIZE' flag specifies to normalize index terms. In this example, both flags are validated by using a '|'. The 'default_tokenizer' parameter specifies a method for tokenizing text. This example specifies 'TokenBigram' that is generally called 'N-gram'.
 
-In this examples, 'TABLE_PAT_KEY|KEY_NORMALIZE' stores master key in patricia-trie and entries each teminology after nomalized.
-The 'default_tokenizer' parametar specifies the way to tokenize target texts. In this examples, we specifies 'TokenBigram' as this parameter, and so we choose 'N-gram' generally called.
+Create an index column for full text search
+-------------------------------------------
 
-Create index-column with fulltext search
-----------------------------------------
+The second step is to create an index column, which allows you to search records from its associated column. That is to say this step specifies which column needs an index.
 
-We will fulltext search 'title' column in 'Site' table. In this case, we create column whose type index in terminology table.
+Let's create an index column for the 'title' column in the 'Site' table.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-6.log
 .. column_create --table Terms --name blog_title --flags COLUMN_INDEX|WITH_POSITION --type Site --source title
 
-This command creates index column 'blog_title' in 'Term' table. '--type' option specifies target indexed table, and '--source' option does target index column.
-In execution example, 'COLUMN_INDEX|WITH_POSITION' for '--flags' option specifies that this column is index column for storing information of terminology existing position. This option should be specified 'COLUMN_INDEX|WITH_POSITION' in generally fulltext searching. This tutorial does not deal with the reason why store information of terminology existing position.
+This command creates an index column 'blog_title' in the 'Terms' table. The '--type' option specifies a target table and the '--source' option specifies a target column. Then, the 'COLUMN_INDEX' flag specifies to create an index column and the 'WITH_POSITION' flag specifies to create a full inverted index, which contains the positions of each index term. This combination 'COLUMN_INDEX|WITH_POSITION' is recommended for the general purpose.
 
 Load data
 ---------
 
-:doc:`/commands/load` is used to load data for groonga database. This command stores json-formatted data in a table.
+A :doc:`/commands/load` command loads JSON-formatted records into a table.
+
+The following adds nine records to the 'Site' table.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-7.log
@@ -190,7 +178,7 @@ Load data
 .. {"_key":"http://example.com/vdw","title":"test test record nine."},
 .. ]
 
-Let's make sure that its table has data with 'select' command.
+Let's make sure that these records are correctly stored.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-8.log
@@ -199,69 +187,60 @@ Let's make sure that its table has data with 'select' command.
 Search data
 -----------
 
-'_id' and '_key' columns are unique in groonga's table, so let's search data in table using these columns.
+Before a full text search, let's try to search data by '_id' and '_key'. These columns work as unique keys.
 
-You can search data using 'select' command with 'query' parameter.
+You can search records by using a 'select' command with a 'query' parameter.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-9.log
 .. select --table Site --query _id:1
 
-'_id:1' specified 'query' parameter means to search records whose '_id' column has '1'.
+'_id:1' specifies to search a record whose ID is 1.
 
-Let's search records with '_key' column.
+Next, let's search a record by a primary key.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-10.log
 .. select --table Site --query "_key:\"http://example.org/\""
 
-'_key:\"http://example.org/\"' specified 'query' parameter means to search records whose '_key' column has '"http://example.org/"'.
-
+'_key:\"http://example.org/\"' specifies to search a record whose primary key is "http://example.org/".
 
-Fulltext searching
-------------------
+Full text search
+----------------
 
-Using 'query' parameter, you can fulltext search with index.
+It's time to make a full text search. You can make a full text search query with the same 'query' parameter.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-11.log
 .. select --table Site --query title:@this
 
-This command shows result of fulltext searching by string 'this' for 'title' column.
-
-"title:@this" specified 'query' parameter means to search records whose 'title' column including 'this' string.
+This command searches records whose 'title' column contains a string 'this'. In this case, only one record matches this query. Note that the lower case query 'this' matches a capitalized 'This' in the 1st record because 'KEY_NORMALIZE' was specified in lexicon column creation.
 
-'select' command has parameter 'match_columns'.
+The 'select' command has an optional parameter 'match_columns'. This parameter specifies default target columns and it is used when target columns are not specified in a query.[1]_
 
-If this parameter is specified, it means to search in columns specified 'match_columns' when 'query' parameter doesn't specify column-name condition.[1]_
-
-If you specify 'match_columns' is 'title' and 'query' is 'this', you can take same result as above query.
+A combination of '--match_columns title' and '--query this' brings you the same result that '--query title:@this' does.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-12.log
 .. select --table Site --match_columns title --query this
 
-Specify output column
----------------------
-
-'output_columns' parameter in 'select' command specifies columns shown in result of search.
+Specify output columns
+----------------------
 
-If you want to specify some columns, you should separate column names by comma(,).
+An 'output_columns' parameter in a 'select' command specifies columns to be shown in the search result. If you want to specify more than one columns, please separate column names by commas (,).
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-13.log
 .. select --table Site --output_columns _key,title,_score --query title:@test
 
-"_score" column is added to The groonga's result. This column has the higher number, the more condition of fulltext seaching matches text.
+This command specifies three output columns including the '_score' column, which stores the relevance score of each record.
 
-Ranges to display
------------------
-
-'select' command can display result in only specified ranges using 'offset' and 'limit' parameter. This parameters is useful when you want to show only a page in much result of searching.
+Specify output ranges
+---------------------
 
-'offset' parameter specifies starting point of result. If you want 'select' command to return from first records, this parameter specifies '0'.
+A 'select' command returns a part of its search result if 'offset' and/or 'limit' parameters are specified. These parameters are useful to paginate a search result, a widely-used interface which shows a search result on a page by page basis.
 
-'limit' parameter specifies how many records of searching result.
+An 'offset' parameter specifies the starting point and a 'limit' parameter specifies the maximum number of records to be returned. If you need the first record in a search result, the offset parameter must be 0 or omitted.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-14.log
@@ -270,23 +249,23 @@ Ranges to display
 .. select --table Site --offset 7 --limit 3
 
 Sort
------
+----
 
-If you use 'sortby' parameter in 'select' command, this command sorts result of searching.
+A 'select' command sorts its result when used with a 'sortby' parameter.
 
-When 'sortby' parameter specifies column name, result is sorted in ascending-order to its column's value. This 'select' command also sort in descending-order when you add hyphen(-) before column name.
+A 'sortby' parameter specifies a column as a sorting creteria. A search result is arranged in ascending order of the column values. If you want to sort a search result in reverse order, please add a leading hyphen (-) to the column name of a parameter.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-15.log
 .. select --table Site --sortby -_id
 
-For condition of sort, you can use '_score' column introduced in the paragraph of "Specify output column".
+You can use the '_score' column as a sorting criteria for ranking a search result.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-16.log
 .. select --table Site --query title:@test --output_columns _id,_score,title --sortby _score
 
-If you want to specify some column names, you should use comma(,) between these names. In this case, when same value of records is existed in first column, this command sorts result of searching to value of second column.
+If you want to specify more than one columns, please separate column names by commas. In such a case, a search result is sorted in order of the column values in the first column, and then records having the same values in the first column are sorted in order of the second column values.
 
 .. groonga-command
 .. include:: ../example/tutorial/introduction-17.log
@@ -294,4 +273,4 @@ If you want to specify some column names, you should use comma(,) between these
 
 .. rubric:: footnote
 
-.. [1] In now groonga's version, you can only use 'match_columns' parameter in the case of existing index of fulltext searching. This parameter cannot be use in searching for ordinary columns.
+.. [1] Currently, a 'match_columns' parameter is available iff there exists an inverted index for full text search. A 'match_columns' parameter for a regular column is not supported.

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/match_columns.txt

@@ -3,10 +3,7 @@
 .. highlightlang:: none
 
 .. groonga-command
-.. table_remove Blog1
-.. table_remove IndexBlog1
-.. table_remove Blog2
-.. table_remove IndexBlog2
+.. database: tutorial-match-columns
 
 match_columnsパラメータ
 =======================

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/micro_blog.txt

@@ -3,10 +3,7 @@
 .. highlightlang:: none
 
 .. groonga-command
-.. table_remove Users
-.. table_remove Comments
-.. table_remove HashTags
-.. table_remove Bigram
+.. database: tutorial-micro-blog
 
 マイクロブログ検索システムの作成
 ================================

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/network.txt

@@ -4,6 +4,9 @@
 
 .. groonga-include : introduction.txt
 
+.. groonga-command
+.. database: tutorial
+
 How to use groonga with network
 ===============================
 

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/patricia_trie.txt

@@ -3,8 +3,7 @@
 .. highlightlang:: none
 
 .. groonga-command
-.. table_remove PatPrefix
-.. table_remove PatSuffix
+.. database: tutorial-patricia-trie
 
 パトリシア木による前方一致検索
 ==============================

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/query_expansion.txt

@@ -2,6 +2,9 @@
 
 .. highlightlang:: none
 
+.. groonga-command
+.. database: tutorial-query-expansion
+
 クエリ拡張
 ==========
 
@@ -14,6 +17,8 @@ groongaでは、 :doc:`/commands/select` コマンドにquery_expansionパラメ
 
 クエリ拡張機能を使用するためには、検索対象となる文書を格納するテーブル(ここでは文書テーブルと呼びます)以外に、ユーザの指定した検索文字列を置換するためのテーブル(ここでは置換テーブルと呼びます)を準備します。置換テーブルでは、その主キーが置換前の文字列となり、文字列型(ShortText)のカラムの値が置換後の文字列となります。
 
+TODO: 文字列型のベクターカラムでも可能であり、その場合は各要素をORでつなげたものに置換されるということを記述する。
+
 実際に文書テーブルと置換テーブルを作成してみましょう。
 
 .. groonga-command

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial/search.txt

@@ -4,6 +4,9 @@
 
 .. groonga-include : data.txt
 
+.. groonga-command
+.. database: tutorial
+
 さまざまな検索条件の指定
 ========================
 

data/vendor/local/share/doc/groonga/ja/html/_sources/tutorial.txt

@@ -2,8 +2,8 @@
 
 .. highlightlang:: none
 
-チュートリアル
-==============
+Tutorial
+========
 
 .. toctree::
    :maxdepth: 2

data/vendor/local/share/doc/groonga/ja/html/_sources/type.txt

@@ -108,12 +108,12 @@ groongaのデータベースでは、テーブルの主キーや、カラムの
 
 Text型とLongText型については、テーブルの主キーに指定することはできません。
 
-ベクトルとして格納できない型
+ベクターとして格納できない型
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-groongaのカラムは、ある型のベクトルを保存することができます。しかし、ShortText, Text, LongTextの３つの型についてはベクトルとして保存することはできません。
+groongaのカラムは、ある型のベクターを保存することができます。しかし、ShortText, Text, LongTextの３つの型についてはベクターとして保存したり出力したりすることはできますが、検索条件やドリルダウン条件に指定することができません。
 
-テーブル型は、ベクトルとして格納することができます。よって、ShortTextのベクトルを保存したい場合には、主キーがShortText型のテーブルを別途作成し、そのテーブルを型として利用します。
+テーブル型は、ベクターとして格納することができます。よって、ShortTextのベクターを検索条件やドリルダウン条件に使用したい場合には、主キーがShortText型のテーブルを別途作成し、そのテーブルを型として利用します。
 
 .. rubric:: 脚注
 

data/vendor/local/share/doc/groonga/ja/html/_static/basic.css

@@ -79,6 +79,14 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
+div.sphinxsidebar #searchbox input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
 img {
     border: 0;
 }
@@ -236,7 +244,6 @@ img.align-center, .figure.align-center, object.align-center {
 }
 
 .align-center {
-    clear: both;
     text-align: center;
 }
 
@@ -440,6 +447,11 @@ dl.glossary dt {
     font-style: oblique;
 }
 
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {

data/vendor/local/share/doc/groonga/ja/html/_static/doctools.js

@@ -2,7 +2,7 @@
  * doctools.js
  * ~~~~~~~~~~~
  *
- * Sphinx JavaScript utilties for all documentation.
+ * Sphinx JavaScript utilities for all documentation.
  *
  * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
@@ -185,9 +185,9 @@ var Documentation = {
           body.highlightText(this.toLowerCase(), 'highlighted');
         });
       }, 10);
-      $('<li class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></li>')
-          .appendTo($('.sidebar .this-page-menu'));
+      $('<p class="highlight-link"><a href="javascript:Documentation.' +
+        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
+          .appendTo($('#searchbox'));
     }
   },
 
@@ -213,7 +213,7 @@ var Documentation = {
    * helper function to hide the search marks again
    */
   hideSearchWords : function() {
-    $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
+    $('#searchbox .highlight-link').fadeOut(300);
     $('span.highlighted').removeClass('highlighted');
   },
 

data/vendor/local/share/doc/groonga/ja/html/_static/searchtools.js

@@ -183,8 +183,8 @@ var Search = {
 
     // lookup as object
     for (var i = 0; i < objectterms.length; i++) {
-      var others = Array.concat(objectterms.slice(0,i),
-                                objectterms.slice(i+1, objectterms.length))
+      var others = [].concat(objectterms.slice(0,i),
+                             objectterms.slice(i+1, objectterms.length))
       var results = this.performObjectSearch(objectterms[i], others);
       // Assume first word is most likely to be the object,
       // other words more likely to be in description.
@@ -331,12 +331,13 @@ var Search = {
         var fullname = (prefix ? prefix + '.' : '') + name;
         if (fullname.toLowerCase().indexOf(object) > -1) {
           var match = objects[prefix][name];
-          var objname = objnames[match[1]];
+          var objname = objnames[match[1]][2];
           var title = titles[match[0]];
           // If more than one term searched for, we require other words to be
           // found in the name/title/description
           if (otherterms.length > 0) {
-            var haystack = (prefix + ' ' + name + ' ' + objname + ' ' + title).toLowerCase();
+            var haystack = (prefix + ' ' + name + ' ' +
+                            objname + ' ' + title).toLowerCase();
             var allfound = true;
             for (var i = 0; i < otherterms.length; i++) {
               if (haystack.indexOf(otherterms[i]) == -1) {
@@ -349,9 +350,12 @@ var Search = {
             }
           }
           var descr = objname + _(', in ') + title;
-          // XXX the generated anchors are not generally correct
-          // XXX there may be custom prefixes
-          result = [filenames[match[0]], fullname, '#'+fullname, descr];
+          anchor = match[3];
+          if (anchor == '')
+            anchor = fullname;
+          else if (anchor == '-')
+            anchor = objnames[match[1]][1] + '-' + fullname;
+          result = [filenames[match[0]], fullname, '#'+anchor, descr];
           switch (match[2]) {
           case 1: objectResults.push(result); break;
           case 0: importantResults.push(result); break;