rroonga 4.0.4-x86-mingw32 → 4.0.5-x86-mingw32

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

@@ -52,90 +52,6 @@ There is a package that provides MySQL compatible normalizer as
 groonga plugins.
 If you want to use that one, install groonga-normalizer-mysql package.
 
-Install groonga-normalizer-mysql package::
-
-  % sudo apt-get install -y -V groonga-normalizer-mysql
-
-jessie
-------
-
-Add the groonga apt repository.
-
-/etc/apt/sources.list.d/groonga.list::
-
-  deb http://packages.groonga.org/debian/ jessie main
-  deb-src http://packages.groonga.org/debian/ jessie main
-
-Install::
-
-  % sudo apt-get update
-  % sudo apt-get install -y --allow-unauthenticated groonga-keyring
-  % sudo apt-get update
-  % sudo apt-get install -y groonga
-
-.. include:: server-use.inc
-
-If you want to use `MeCab <http://mecab.sourceforge.net/>`_ as a
-tokenizer, install groonga-tokenizer-mecab package.
-
-Install groonga-tokenizer-mecab package::
-
-  % sudo apt-get install -y -V groonga-tokenizer-mecab
-
-There is a package that provides `Munin
-<http://munin-monitoring.org/>`_ plugins. If you want to monitor
-groonga status by Munin, install groonga-munin-plugins package.
-
-Install groonga-munin-plugins package::
-
-  % sudo apt-get install -y -V groonga-munin-plugins
-
-There is a package that provides MySQL compatible normalizer as
-Groonga plugins.
-If you want to use that one, install groonga-normalizer-mysql package.
-
-Install groonga-normalizer-mysql package::
-
-  % sudo apt-get install -y -V groonga-normalizer-mysql
-
-sid
----
-
-Add the groonga apt repository.
-
-/etc/apt/sources.list.d/groonga.list::
-
-  deb http://packages.groonga.org/debian/ unstable main
-  deb-src http://packages.groonga.org/debian/ unstable main
-
-Install::
-
-  % sudo apt-get update
-  % sudo apt-get install -y --allow-unauthenticated groonga-keyring
-  % sudo apt-get update
-  % sudo apt-get install -y -V groonga
-
-.. include:: server-use.inc
-
-If you want to use `MeCab <http://mecab.sourceforge.net/>`_ as a
-tokenizer, install groonga-tokenizer-mecab package.
-
-Install groonga-tokenizer-mecab package::
-
-  % sudo apt-get install -y -V groonga-tokenizer-mecab
-
-There is a package that provides `Munin
-<http://munin-monitoring.org/>`_ plugins. If you want to monitor
-groonga status by Munin, install groonga-munin-plugins package.
-
-Install groonga-munin-plugins package::
-
-  % sudo apt-get install -y -V groonga-munin-plugins
-
-There is a package that provides MySQL compatible normalizer as
-groonga plugins.
-If you want to use that one, install groonga-normalizer-mysql package.
-
 Install groonga-normalizer-mysql package::
 
   % sudo apt-get install -y -V groonga-normalizer-mysql
@@ -149,9 +65,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % tar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % tar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -80,9 +80,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % tar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % tar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -39,9 +39,9 @@ Install `Xcode <https://developer.apple.com/xcode/>`_.
 
 Download source::
 
-  % curl -O http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % tar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % curl -O http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % tar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -74,9 +74,9 @@ Build from source
 Groonga uses GNU build system. So the following is the simplest build
 steps::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % tar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % tar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
   % ./configure
   % make
   % sudo make install

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

@@ -17,9 +17,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % gtar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % gtar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
 
 Configure with ``CFLAGS="-m64" CXXFLAGS="-m64"`` variables. They are
 needed for building 64-bit version. To build 32-bit version, just

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

@@ -74,9 +74,9 @@ Install required packages to build Groonga::
 
 Download source::
 
-  % wget http://packages.groonga.org/source/groonga/groonga-4.0.5.tar.gz
-  % tar xvzf groonga-4.0.5.tar.gz
-  % cd groonga-4.0.5
+  % wget http://packages.groonga.org/source/groonga/groonga-4.0.6.tar.gz
+  % tar xvzf groonga-4.0.6.tar.gz
+  % cd groonga-4.0.6
 
 Configure (see :ref:`source-configure` about ``configure`` options)::
 

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

@@ -21,14 +21,14 @@ Installer
 For 32-bit environment, download x86 executable binary from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.5-x86.exe
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.6-x86.exe
 
 Then run it.
 
 For 64-bit environment, download x64 executable binary from
 packages.goronga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.5-x64.exe
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.6-x64.exe
 
 Then run it.
 
@@ -41,14 +41,14 @@ zip
 For 32-bit environment, download x86 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.5-x86.zip
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.6-x86.zip
 
 Then extract it.
 
 For 64-bit environment, download x64 zip archive from
 packages.groonga.org:
 
-  * http://packages.groonga.org/windows/groonga/groonga-4.0.5-x64.zip
+  * http://packages.groonga.org/windows/groonga/groonga-4.0.6-x64.zip
 
 Then extract it.
 
@@ -66,27 +66,27 @@ Windows. Here are required tools:
 
 Download zipped source from packages.groonga.org:
 
-  * http://packages.groonga.org/source/groonga/groonga-4.0.5.zip
+  * http://packages.groonga.org/source/groonga/groonga-4.0.6.zip
 
 Then extract it.
 
 Move to the Groonga's source folder::
 
-  > cd c:\Users\%USERNAME%\Downloads\groonga-4.0.5
+  > cd c:\Users\%USERNAME%\Downloads\groonga-4.0.6
 
 Configure by ``cmake``. The following commnad line is for 64-bit
 version. To build 32-bit version, use ``-G "Visual Studio 10"``
 parameter instead::
 
-  groonga-4.0.5> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
+  groonga-4.0.6> cmake . -G "Visual Studio 10 Win64" -DCMAKE_INSTALL_PREFIX=C:\groonga
 
 Build::
 
-  groonga-4.0.5> cmake --build . --config Release
+  groonga-4.0.6> cmake --build . --config Release
 
 Install::
 
-  groonga-4.0.5> cmake --build . --config Release --target Install
+  groonga-4.0.6> cmake --build . --config Release --target Install
 
 After the above steps, :doc:`/reference/executables/groonga` is found in
 ``c:\groonga\bin\groonga.exe``.

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

@@ -7,6 +7,73 @@
 News
 ====
 
+.. _release-4-0-6:
+
+Release 4.0.6 - 2014/09/29
+--------------------------
+
+Improvements
+^^^^^^^^^^^^
+
+* [deb] Updated to follow the rule about machine-readable
+  debian/copyright file. [Reported by Hideki Yamane]
+* [deb][rpm] Changed to use signal instead of HTTP to control nginx.
+  This way meets nginx style init script.
+* [doc] Updated English documentation about [ :doc:`/reference/executables` ].
+  [GitHub#196] [Patch by Masafumi Yokoyama]
+* [OS X] Added missing sphinx error message for Homebrew users.
+  [GitHub#198] [Patch by cosmo0920]
+* Exported :c:func:`grn_expr_alloc_const` which allocates constant object.
+  It is exported for mruby.
+* [mruby] Query optimizer by mruby became a practical for some range select query.
+  For example, mruby optimizer overhead is negligible enough for query such as
+  "between(X, 0, 'exclude', 100, 'include')" - "X > 0 && X <= 100".
+* [doc] Changed to recommend GitHub for reporting issues.
+  Until now, Redmine account must be approved by administrator, so you can not
+  report at feel free. [GitHub#202] [Patch by cosmo0920]
+* [doc] Translated C API document. [GitHub#203] [Patch by NOKUBI Takatsugu]
+* Supported to customize similarity threshold by ``'*S10"..."'`` syntax.
+* Added source column validation to
+  :doc:`/reference/commands/column_create`.  If source column doesn't
+  exist, :doc:`/reference/commands/column_create` returns ``false`` and
+  column isn't created.
+* [windows] Enabled mruby.
+* [debian] Dropped Debian jessie and sid support.
+
+Fixes
+^^^^^
+
+* [windows] Disabled KyTea by default because of redistribution license issue.
+* [windows] Disabled libedit support by default.
+* Fixed a bug that similar search doesn't use IDF (Inverse Document Frequency)
+  for choosing target tokens.
+  In the previous versions, it used token ID instead of IDF.
+  [groonga-dev,02731] [groonga-dev,02754] [Reported by Satoshi Mitani, warp kawada]
+* Fixed a crash bug when deleting a record.
+  If the table of the record has ``_key`` and ``_key`` is
+  indexed from two or more index columns, deleting causes a crash.
+* Fixed compiler warning about unused variable 'e'. [GitHub#197] [Patch by cosmo0920]
+* [fedora][httpd] Fixed service start failure without log directory.
+* [mruby] Fixed build error with ``--disable-mruby``.
+  [GitHub#200] [Patch by cosmo0920]
+* Fixed build warning about CMP0014 for MariaDB bundled Mroonga package.
+  [GitHub#201] [Patch by cosmo0920]
+* Fixed a bug that "*" is parsed as prefix search with empty string.
+  [groonga-dev,02796] [Reported by Kazuhiko]
+* [httpd] Updated bundled nginx version to the latest mainline (1.7.5).
+  This update contains vulnerability fix (CVE-2014-3616).
+
+Thanks
+^^^^^^
+
+* Hideki Yamane
+* Masafumi Yokoyama
+* cosmo0920
+* NOKUBI Takatsugu
+* Satoshi Mitani
+* warp kawada
+* Kazuhiko
+
 .. _release-4-0-5:
 
 Release 4.0.5 - 2014/08/29
@@ -18,6 +85,7 @@ Improvements
 * Dropped Ubuntu 13.10 (Saucy Salamander).
 * Supported to show weight vector element as XML.
 * [ :doc:`/reference/functions/between` ] Supported outside of key range.
+  [GitHub#183] [Patch by Naoya Murakami]
 * [mruby] Changed to use Onigmo as regexp implementation.
 * Added :doc:`/reference/functions/highlight_full` and
   :doc:`/reference/functions/highlight_html` which tags

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

@@ -2,10 +2,10 @@
 
 .. highlightlang:: none
 
-実行ファイル
-============
+Executables
+===========
 
-groongaパッケージが提供する実行ファイルについて説明します。
+This section describes executable files provided by groonga package.
 
 .. toctree::
    :maxdepth: 1

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

@@ -120,7 +120,7 @@ Use ``--drilldown_sortby`` if you want to sort the result of drilldown. For exam
 limits drildown results
 ------------------------
 
-The number of drilldown results is limited to 10 as a default. Use ``drilldown_limits`` and ``drilldown_offset`` parameter to customize orilldown results.
+The number of drilldown results is limited to 10 as a default. Use ``drilldown_limit`` and ``drilldown_offset`` parameter to customize orilldown results.
 
 .. groonga-command
 .. include:: ../example/tutorial/drilldown-limit.log

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

@@ -2,10 +2,11 @@
 
 .. highlightlang:: none
 
-全文検索の語彙表に対する追加情報
-================================
+Additional information about lexicon for full text search
+=========================================================
 
-Groongaでは、全文検索に用いるための語意表がテーブルとして扱えます。よって、語彙ごとに複数の情報を保持することができます。例えば、語彙の出現数や検索ストップワードのフラグ、単語の重要度などを保持することができます。
+Groonga uses lexicon for full text search as a table. Thus, Groonga can hold multiple information each lexicon.
+For example, Groonga holds frequency of word, flags for stop word, importance of word and so on.
 
-この項目については、現在執筆中です。
+TODO: Write document.
 

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

@@ -5,15 +5,16 @@
 .. groonga-command
 .. database: tutorial-micro-blog
 
-マイクロブログ検索システムの作成
-================================
+Let's create micro-blog
+=======================
 
-これまで学んだGroongaの機能を用いて、マイクロブログの検索システムを作成してみましょう。マイクロブログとは、Twitterのような短いメッセージを投稿するブログです。
+Let's create micro-blog with full text search by Groonga.
+Micro-blog is one of the broadcast medium in the forms of blog. It is mainly used to post small messages like a Twitter.
 
-テーブルの作成
+Create a table
 --------------
 
-まずは、テーブルを作成します。
+Let's create table.
 
 ::
 
@@ -48,95 +49,97 @@
  column_create --table GeoIndex --name users_location --type Users --flags COLUMN_INDEX --source location
  column_create --table GeoIndex --name comments_location --type Comments --flags COLUMN_INDEX --source location
 
-Usersテーブル
-^^^^^^^^^^^^^
+Users table
+^^^^^^^^^^^
 
-ユーザーの名前や自己紹介文、フォローしているユーザー一覧など、ユーザー情報を格納するためのテーブルです。
+This is the table which stores user information.
+It stores name of user, profile, list of follower and so on.
 
 ``_key``
-  ユーザーID
+  User ID
 
 ``name``
-  ユーザー名
+  User name
 
 ``follower``
-  フォローしているユーザーの一覧
+  List of following users
 
 ``favorites``
-  お気に入りのコメント一覧
+  List of favorite comments
 
 ``location``
-  ユーザーの現在地（緯度経度座標）
+  Current location of user (geolocation)
 
 ``location_str``
-  ユーザーの現在地（文字列）
+  Current location of user (string)
 
 ``description``
-  ユーザーの自己紹介
+  User profile
 
 ``followee``
-  Usersテーブルのfollowerカラムに対するインデックス。
-  このインデックスを作ることで、あるユーザーをフォローしているユーザーを検索できるようになります。
+  Indexes for ``follower`` column in ``Users`` table.
+  With this indexes, you can search users who follows the person.
 
-Commentsテーブル
-^^^^^^^^^^^^^^^^
+Comments table
+^^^^^^^^^^^^^^
 
-コメント内容や投稿日時、返信先情報など、コメントに関する内容を格納するテーブルです。
+This is the table which stores comments and its metadata.
+It stores content of comment, posted date, comment which reply to, and so on.
 
 ``_key``
-  コメントID
+  Comment ID
 
 ``comment``
-  コメント内容
+  Content of comment
 
 ``last_modified``
-  投稿日時
+  Posted date
 
 ``replied_to``
-  返信元のコメント内容
+  Comment which you reply to someone
 
 ``replied_users``
-  返信先のユーザーの一覧
+  List of users who you reply to
 
 ``hash_tags``
-  コメントのハッシュタグの一覧
+  List of hash tags about comment
 
 ``location``
-  投稿場所(緯度経度座標のため)
+  Posted place (for geolocation)
 
 ``posted_by``
-  コメントを書いたユーザー
+  Person who write comment
 
 ``favorited_by``
-  Usersテーブルのfavoritesカラムに対するインデックス。
-  このインデックスを作ることで、指定したコメントを誰がお気に入りに入れているのかを検索できるようになります。
+  Indexes for ``favorites`` column in ``Users`` table.
+  With this indexes, you can search the person who mark comment as favorite one.
 
-HashTagsテーブル
-^^^^^^^^^^^^^^^^
+HashTags table
+^^^^^^^^^^^^^^
 
-コメントのハッシュタグを一覧で保存するためのテーブルです。
+This is the table which stores hash tags for comments.
 
 ``_key``
-  ハッシュタグ
+  Hash tag
 
 ``hash_index``
-  「Comments.hash_tags」のインデックス。
-  このインデックスを作ることで、指定したハッシュタグのついているコメントの一覧を出すことが出来るようになります。
+  Indexes for ``Comments.hash_tags``.
+  With this indexes, you can search list of comments with specified hash tags.
 
-Bigramテーブル
-^^^^^^^^^^^^^^
+Bigram table
+^^^^^^^^^^^^
 
-ユーザー情報・コメントで全文検索が出来るようにするためのインデックスを格納するテーブルです。
+This is the table which stores indexes for full text search by user information or comments.
 
 ``_key``
-  単語
+  Word
 
 ``users_index``
-  ユーザー情報のインデックス。
-  このカラムは、ユーザー名「Users.name」、現在地「Users.location_str」、自己紹介文「Users.description」のインデックスになっています。
+  Indexes of user information.
+  This column contains indexes of user name (``Users.name``), current location (``Users.location_str``), profile (``Users.description``).
 
 ``comment_index``
-  コメント内容「Comments.comment」のインデックス
+  Indexes about content of comments (``Comments.comment``).
 
 GeoIndex table
 ^^^^^^^^^^^^^^
@@ -149,114 +152,118 @@ This is the table which stores indexes of location column to search geo location
 ``comments_location``
   Indexes of location column for Comments table
 
-データのロード
---------------
+Loading data
+------------
 
-つづいて、テスト用データをロードします。
+Then, load example data.
 
 ::
 
  load --table Users
  [
    {
-     "_key": "daijiro",
-     "name": "hsiomaneki",
-     "follower": ["tasukuchan"],
+     "_key": "alice",
+     "name": "Alice",
+     "follower": ["bob"],
      "favorites": [],
-     "location": "127678039x502643091",
-     "location_str": "神奈川県",
-     "description": "groonga developer"
+     "location": "152489000x-255829000",
+     "location_str": "Boston, Massachusetts",
+     "description": "Groonga developer"
    },
    {
-     "_key": "tasukuchan",
-     "name": "グニャラくん",
-     "follower": ["daijiro","OffGao"],
-     "favorites": ["daijiro:1","OffGao:1"],
-     "location": "128423343x502929252",
-     "location_str": "東京都渋谷区",
-     "description": "エロいおっさん"
+     "_key": "bob",
+     "name": "Bob",
+     "follower": ["alice","charlie"],
+     "favorites": ["alice:1","charlie:1"],
+     "location": "146249000x-266228000",
+     "location_str": "Brooklyn, New York City",
+     "description": ""
    },
    {
-     "_key": "OffGao",
-     "name": "OffGao",
-     "follower": ["tasukuchan","daijiro"],
-     "favorites": ["tasukuchan:1","daijiro:1"],
-     "location": "128544408x502801502",
-     "location_str": "東京都中野区",
-     "description": "がおがお"
+     "_key": "charlie",
+     "name": "Charlie",
+     "follower": ["alice","bob"],
+     "favorites": ["alice:1","bob:1"],
+     "location": "146607190x-267021260",
+     "location_str": "Newark, New Jersey",
+     "description": "Hmm,Hmm"
    }
  ]
 
  load --table Comments
  [
    {
-     "_key": "daijiro:1",
-     "comment": "マイクロブログ作ってみました（甘栗むいちゃいました的な感じで）。",
+     "_key": "alice:1",
+     "comment": "I've created micro-blog!",
      "last_modified": "2010/03/17 12:05:00",
-     "posted_by": "daijiro",
+     "posted_by": "alice",
    },
    {
-     "_key": "tasukuchan:1",
-     "comment": "初の書き込み。テストテスト。",
+     "_key": "bob:1",
+     "comment": "First post. test,test...",
      "last_modified": "2010/03/17 12:00:00",
-     "posted_by": "tasukuchan",
+     "posted_by": "bob",
    },
    {
-     "_key": "daijiro:2",
-     "comment": "@tasukuchan ようこそ!!!",
+     "_key": "alice:2",
+     "comment": "@bob Welcome!!!",
      "last_modified": "2010/03/17 12:05:00",
-     "replied_to": "tasukuchan:1",
-     "replied_users": ["tasukuchan"],
-     "posted_by": "daijiro",
+     "replied_to": "bob:1",
+     "replied_users": ["bob"],
+     "posted_by": "alice",
    },
    {
-     "_key": "tasukuchan:2",
-     "comment": "@daijiro ありがとう！",
+     "_key": "bob:2",
+     "comment": "@alice Thanks!",
      "last_modified": "2010/03/17 13:00:00",
-     "replied_to": "daijiro:2",
-     "replied_users": ["daijiro"],
-     "posted_by": "tasukuchan",
+     "replied_to": "alice:2",
+     "replied_users": ["alice"],
+     "posted_by": "bob",
    },
    {
-     "_key": "tasukuchan:3",
-     "comment": "groongaなう #groonga",
+     "_key": "bob:3",
+     "comment": "I've just used 'Try-Groonga' now! #groonga",
      "last_modified": "2010/03/17 14:00:00",
      "hash_tags": ["groonga"],
-     "location": "127972422x503117107",
-     "posted_by": "tasukuchan",
+     "location": "146566000x-266422000",
+     "posted_by": "bob",
    },
    {
-     "_key": "tasukuchan:4",
-     "comment": "groonga開発合宿のため羽田空港に来ました！ #groonga #travel",
+     "_key": "bob:4",
+     "comment": "I'm come at city of New York for development camp! #groonga #travel",
      "last_modified": "2010/03/17 14:05:00",
      "hash_tags": ["groonga", "travel"],
-     "location": "127975798x502919856",
-     "posted_by": "tasukuchan",
+     "location": "146566000x-266422000",
+     "posted_by": "bob",
    },
    {
-     "_key": "OffGao:1",
-     "comment": "@daijiro @tasukuchan 登録してみましたよー！",
+     "_key": "charlie:1",
+     "comment": "@alice @bob I've tried to register!",
      "last_modified": "2010/03/17 15:00:00",
-     "replied_users": ["daijiro", "tasukuchan"],
-     "location": "128551935x502796433",
-     "posted_by": "OffGao",
+     "replied_users": ["alice", "bob"],
+     "location": "146607190x-267021260",
+     "posted_by": "charlie",
    }
    {
-     "_key": "OffGao:2",
-     "comment": "中野ブロードウェイなうなう",
+     "_key": "charlie:2",
+     "comment": "I'm at the Museum of Modern Art in NY now!",
      "last_modified": "2010/03/17 15:05:00",
-     "location": "128551935x502796434",
-     "posted_by": "OffGao",
+     "location": "146741340x-266319590",
+     "posted_by": "charlie",
    }
  ]
 
-Usersテーブルのfollowerカラムとfavoritesカラム、そしてCommentsテーブルのreplied_usersカラムは、ベクターカラムです。そのため、これらのカラムは配列で値を指定します。
+``follower`` column and ``favorites`` column in ``Users`` table and ``replied_users`` column in ``Comments`` table are vector column, so specify the value as an array.
 
-Usersテーブルのlocationカラムと、Commentsテーブルのlocationカラムは、GeoPoint型です。この型での値の指定は、"[緯度]x[経度]"と記述して指定します。
+``location`` column in ``Users`` table, ``location`` column in ``Comments`` table use GeoPoint type. This type accepts "[latitude]x[longitude]".
 
-Commentsテーブルのlast_modifiedカラムは、Time型です。この型での値を指定する方法は2つあります。
-1つ目の方法は、1970年1月1日0時0分0秒からの経過秒数の値を直接指定する方法です。このとき、小数部分を指定することでマイクロ秒数での指定が可能です。指定した値は、データのロードの際にマイクロ秒を単位とする整数値に変換後、格納されます。
-2つ目の方法は、文字列で日時と時刻を指定する方法です。"年/月/日 時:分:秒"というフォーマットで記述することで、データロードの際に文字列からキャストされ、マイクロ秒数の値が格納されます。
+``last_modified`` column in ``Comments`` table use Time type.
+
+There are two way to specify the value.
+First, specify epoch (seconds since Jan, 1, 1970 AM 00:00:00) directly. In this case, you can specify micro seconds as fractional part.
+The value is converted from factional part to the time which is micro seconds based one when data is loaded.
+The second, specify the timestamp as string in following format: "(YEAR)/(MONTH)/(DAY) (HOUR):(MINUTE):(SECOND)". In this way, the string is casted to proper micro seconds
+when data is loaded.
 
 .. groonga-command
 ..
@@ -265,7 +272,7 @@ Commentsテーブルのlast_modifiedカラムは、Time型です。この型で
  table_create --name HashTags --flags TABLE_HASH_KEY --key_type ShortText
  table_create --name Bigram --flags TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText --default_tokenizer TokenBigram
  table_create --name GeoIndex --flags TABLE_PAT_KEY --key_type WGS84GeoPoint
-
+ 
  column_create --table Users --name name --flags COLUMN_SCALAR --type ShortText
  column_create --table Users --name follower --flags COLUMN_VECTOR --type Users
  column_create --table Users --name favorites --flags COLUMN_VECTOR --type Comments
@@ -273,7 +280,7 @@ Commentsテーブルのlast_modifiedカラムは、Time型です。この型で
  column_create --table Users --name location_str --flags COLUMN_SCALAR --type ShortText
  column_create --table Users --name description --flags COLUMN_SCALAR --type ShortText
  column_create --table Users --name followee --flags COLUMN_INDEX --type Users --source follower
-
+ 
  column_create --table Comments --name comment --flags COLUMN_SCALAR --type ShortText
  column_create --table Comments --name last_modified --flags COLUMN_SCALAR --type Time
  column_create --table Comments --name replied_to --flags COLUMN_SCALAR --type Comments
@@ -282,224 +289,250 @@ Commentsテーブルのlast_modifiedカラムは、Time型です。この型で
  column_create --table Comments --name location --flags COLUMN_SCALAR --type WGS84GeoPoint
  column_create --table Comments --name posted_by --flags COLUMN_SCALAR --type Users
  column_create --table Comments --name favorited_by --flags COLUMN_INDEX --type Users --source favorites
-
+ 
  column_create --table HashTags --name hash_index --flags COLUMN_INDEX --type Comments --source hash_tags
-
+ 
  column_create --table Bigram --name users_index --flags COLUMN_INDEX|WITH_POSITION|WITH_SECTION --type Users --source name,location_str,description
  column_create --table Bigram --name comment_index --flags COLUMN_INDEX|WITH_POSITION --type Comments --source comment
-
+ 
  column_create --table GeoIndex --name users_location --type Users --flags COLUMN_INDEX --source location
  column_create --table GeoIndex --name comments_location --type Comments --flags COLUMN_INDEX --source location
-
+ 
  load --table Users
  [
    {
-     "_key": "daijiro",
-     "name": "hsiomaneki",
-     "follower": ["tasukuchan"],
+     "_key": "alice",
+     "name": "Alice",
+     "follower": ["bob"],
      "favorites": [],
-     "location": "127678039x502643091",
-     "location_str": "神奈川県",
-     "description": "groonga developer"
+     "location": "152489000x-255829000",
+     "location_str": "Boston, Massachusetts",
+     "description": "Groonga developer"
    },
    {
-     "_key": "tasukuchan",
-     "name": "グニャラくん",
-     "follower": ["daijiro","OffGao"],
-     "favorites": ["daijiro:1","OffGao:1"],
-     "location": "128423343x502929252",
-     "location_str": "東京都渋谷区",
-     "description": "エロいおっさん"
+     "_key": "bob",
+     "name": "Bob",
+     "follower": ["alice","charlie"],
+     "favorites": ["alice:1","charlie:1"],
+     "location": "146249000x-266228000",
+     "location_str": "Brooklyn, New York City",
+     "description": ""
    },
    {
-     "_key": "OffGao",
-     "name": "OffGao",
-     "follower": ["tasukuchan","daijiro"],
-     "favorites": ["tasukuchan:1","daijiro:1"],
-     "location": "128544408x502801502",
-     "location_str": "東京都中野区",
-     "description": "がおがお"
+     "_key": "charlie",
+     "name": "Charlie",
+     "follower": ["alice","bob"],
+     "favorites": ["alice:1","bob:1"],
+     "location": "146607190x-267021260",
+     "location_str": "Newark, New Jersey",
+     "description": "Hmm,Hmm"
    }
  ]
-
+ 
  load --table Comments
  [
    {
-     "_key": "daijiro:1",
-     "comment": "マイクロブログ作ってみました（甘栗むいちゃいました的な感じで）。",
+     "_key": "alice:1",
+     "comment": "I've created micro-blog!",
      "last_modified": "2010/03/17 12:05:00",
-     "posted_by": "daijiro",
+     "posted_by": "alice",
    },
    {
-     "_key": "tasukuchan:1",
-     "comment": "初の書き込み。テストテスト。",
+     "_key": "bob:1",
+     "comment": "First post. test,test...",
      "last_modified": "2010/03/17 12:00:00",
-     "posted_by": "tasukuchan",
+     "posted_by": "bob",
    },
    {
-     "_key": "daijiro:2",
-     "comment": "@tasukuchan ようこそ!!!",
+     "_key": "alice:2",
+     "comment": "@bob Welcome!!!",
      "last_modified": "2010/03/17 12:05:00",
-     "replied_to": "tasukuchan:1",
-     "replied_users": ["tasukuchan"],
-     "posted_by": "daijiro",
+     "replied_to": "bob:1",
+     "replied_users": ["bob"],
+     "posted_by": "alice",
    },
    {
-     "_key": "tasukuchan:2",
-     "comment": "@daijiro ありがとう！",
+     "_key": "bob:2",
+     "comment": "@alice Thanks!",
      "last_modified": "2010/03/17 13:00:00",
-     "replied_to": "daijiro:2",
-     "replied_users": ["daijiro"],
-     "posted_by": "tasukuchan",
+     "replied_to": "alice:2",
+     "replied_users": ["alice"],
+     "posted_by": "bob",
    },
    {
-     "_key": "tasukuchan:3",
-     "comment": "groongaなう #groonga",
+     "_key": "bob:3",
+     "comment": "I've just used 'Try-Groonga' now! #groonga",
      "last_modified": "2010/03/17 14:00:00",
      "hash_tags": ["groonga"],
-     "location": "127972422x503117107",
-     "posted_by": "tasukuchan",
+     "location": "146566000x-266422000",
+     "posted_by": "bob",
    },
    {
-     "_key": "tasukuchan:4",
-     "comment": "groonga開発合宿のため羽田空港に来ました！ #groonga #travel",
+     "_key": "bob:4",
+     "comment": "I'm come at city of New York for development camp! #groonga #travel",
      "last_modified": "2010/03/17 14:05:00",
      "hash_tags": ["groonga", "travel"],
-     "location": "127975798x502919856",
-     "posted_by": "tasukuchan",
+     "location": "146566000x-266422000",
+     "posted_by": "bob",
    },
    {
-     "_key": "OffGao:1",
-     "comment": "@daijiro @tasukuchan 登録してみましたよー！",
+     "_key": "charlie:1",
+     "comment": "@alice @bob I've tried to register!",
      "last_modified": "2010/03/17 15:00:00",
-     "replied_users": ["daijiro", "tasukuchan"],
-     "location": "128551935x502796433",
-     "posted_by": "OffGao",
+     "replied_users": ["alice", "bob"],
+     "location": "146607190x-267021260",
+     "posted_by": "charlie",
    }
    {
-     "_key": "OffGao:2",
-     "comment": "中野ブロードウェイなうなう",
+     "_key": "charlie:2",
+     "comment": "I'm at the Museum of Modern Art in NY now!",
      "last_modified": "2010/03/17 15:05:00",
-     "location": "128551935x502796434",
-     "posted_by": "OffGao",
+     "location": "146741340x-266319590",
+     "posted_by": "charlie",
    }
  ]
 
 
 
-検索
-----
+Search
+------
 
-それでは、実際に検索をしてみましょう。
+Let's search micro-blog.
 
-キーワードでユーザー検索
-^^^^^^^^^^^^^^^^^^^^^^^^
-ここでは、 :doc:`match_columns` で扱った、複数カラムを対象とした検索を行います。
-指定された文字列で、ユーザー名・現在地・自己紹介文を対象に検索をします。
+Search users by keyword
+^^^^^^^^^^^^^^^^^^^^^^^
+
+In this section, we search micro-blog against multiple column by keyword.
+See :doc:`match_columns` to search multiple column at once.
+
+Let's search user from micro-blog's user name, location, description entries.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-1.log
-.. select --table Users --match_columns name,location_str,description --query 東京 --output_columns _key,name
+.. include:: ../example/tutorial/micro_blog_keyword.log
+.. select --table Users --match_columns name,location_str,description --query "New York" --output_columns _key,name
+
+By using "New York" as searching keyword for user, "Bob" who lives in "New York" is listed in search result.
 
-「東京」をキーワードにユーザー検索した結果、東京都に住んでいる「グニャラくん」と「OffGao」がヒットしました。
+Search users by geolocation data (GeoPoint)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-GeoPointでユーザー検索
-^^^^^^^^^^^^^^^^^^^^^^
+In this section, we search users by column data which use type of GeoPoint.
+See :doc:`search` about GeoPoint column.
 
-ここでは、 :doc:`search` で扱った、GeoPoint型のカラムで検索をします。
-以下の例では、指定された位置から5000m以内にいるユーザーを検索しています。
+Following example searches users who live in within 20km from specified location.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-2.log
-.. select --table Users --filter 'geo_in_circle(location,"128484216x502919856",5000)' --output_columns _key,name
+.. include:: ../example/tutorial/micro_blog_user.log
+.. select --table Users --filter 'geo_in_circle(location,"146710080x-266315480",20000)' --output_columns _key,name
 
-新宿駅から5km以内にすんでいるユーザーを検索したところ、「グニャラくん」と「OffGao」がヒットしました。
+It shows that "Bob" and "Charlie" lives in within 20 km from station of "Grand Central Terminal".
 
-あるユーザーをフォローしているユーザーの検索
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Search users who follows specific user
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-ここでは、 :doc:`index` で扱った、参照関係の逆引きをします。
-以下の例では、Usersテーブルのfollowerカラムにあるフォローリストを逆引きします。
+In this section, we do reverse resolution of reference relationships which is described at :doc:`index`.
+
+Following examples shows reverse resolution about ``follower`` column of ``Users`` table.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-3.log
-.. select --table Users --query follower:@tasukuchan --output_columns _key,name
+.. include:: ../example/tutorial/micro_blog_follower.log
+.. select --table Users --query follower:@bob --output_columns _key,name
+
+It shows that "Alice" and "Charlie" follows "Bob".
 
-「グニャラくん」をフォローしている「hsiomaneki」と「OffGao」がヒットしました。
+Search comments by using the value of GeoPoint type
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-GeoPointでコメント検索
-^^^^^^^^^^^^^^^^^^^^^^
-ある範囲内で書かれたコメントを検索します。
-また、 :doc:`drilldown` で扱ったドリルダウンも行います。検索結果をハッシュタグとユーザーでドリルダウンし、ユーザー別・ハッシュタグ別のカウントを出します。
+In this section, we search comments which are written within specific location.
+
+Then, we also use drill down which is described at :doc:`drilldown`.
+Following example shows how to drill down against search results.
+As a result, we get the value of count which is grouped by user, and hash tags respectively.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-4.log
-.. select --table Comments --filter 'geo_in_circle(location,"127975798x502919856",20000)' --output_columns posted_by.name,comment --drilldown hash_tags,posted_by
+.. include:: ../example/tutorial/micro_blog_drilldown.log
+.. select --table Comments --filter 'geo_in_circle(location,"146867000x-266280000",20000)' --output_columns posted_by.name,comment --drilldown hash_tags,posted_by
 
-範囲を広く指定したため、位置情報のあるすべてのコメントがヒットしました。そして、ヒットしたコメントからドリルダウンされた結果も返ってきており、ハッシュタグは「#groonga」が2つに「#travel」が1つ、投稿者は「グニャラくん」「OffGao」がそれぞれ2件ずつであることがわかります。
+Above query searches comments which are posted within 20 km from Central Park in city of New York.
 
-キーワードでコメント検索
-^^^^^^^^^^^^^^^^^^^^^^^^
-あるキーワードを含むコメントを検索します。
-さらに、 :doc:`search` で扱った、スコア値_scoreも出してみましょう。
+As specified range is 20 km, all comments with location are collected.
+You know that search results contain 2 #groonga hash tags and one #travel hash tag, and bob and charlie posted 2 comments.
+
+Search comments by keyword
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this section, we search comments which contains specific keyword.
+And more, Let's calculate the value of `_score` which is described at :doc:`search`.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-5.log
-.. select --table Comments --query comment:@なう --output_columns comment,_score
+.. include:: ../example/tutorial/micro_blog_score.log
+.. select --table Comments --query comment:@Now --output_columns comment,_score
+
+By using 'Now' as a keyword, above query returns 2 comments. It also contains count of 'Now' as the value of `_score`.
 
-「なう」をキーワードにコメント検索した結果、2件のコメントがヒットしました。また、_scoreの値も返ってきており、「なう」の数が出力されていることが確認できます。
+Search comments by keyword and geolocation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-GeoPointとキーワードでコメント検索
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-今度は、キーワードとGeoPointの両方を条件に検索をしてみます。--queryと--filterの両方を使用した場合、両方の条件に一致するレコードがヒットします。
+In this section, we search comments by specific keyword and geolocation.
+By using `--query` and `--filter` option, following query returns records which are matched to both conditions.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-6.log
-.. select --table Comments --query comment:@羽田 --filter 'geo_in_circle(location,"127975798x502919856",20000)' --output_columns posted_by.name,comment --drilldown hash_tags,posted_by
+.. include:: ../example/tutorial/micro_blog_keyword_and_location.log
+.. select --table Comments --query comment:@New --filter 'geo_in_circle(location,"146867000x-266280000",20000)' --output_columns posted_by.name,comment --drilldown hash_tags,posted_by
 
-両方の条件を満たすコメントが1件ヒットしました。また、ドリルダウンの結果も返ってきており、「グニャラくん」のコメント1件であることがわかります。
+It returns 1 comment which meets both condition.
+It also returns result of drilldown. There is 1 comment which is commented by Bob.
 
-ハッシュタグでコメント検索
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-あるハッシュタグのついているコメントを検索します。
-これも、 :doc:`index` で扱った、参照関係の逆引きを使います。
+Search comments by hash tags
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this section, we search comments which contains specific hash tags.
+Let's use reverse resolution of reference relationships.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-7.log
+.. include:: ../example/tutorial/micro_blog_hash_tag.log
 .. select --table Comments --query hash_tags:@groonga --output_columns posted_by.name,comment --drilldown posted_by
 
-#groongaタグの付いている2件のコメントがヒットしました。また、投稿者のドリルダウンも返ってきており、2件とも「グニャラくん」のものであることがわかります。
+Above query returns 2 comments which contains #groonga hash tag.
+It also returns result of drilldown grouped by person who posted it. It shows that there are 2 comments. Bob commented it.
+
+Search comments by user id
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-ユーザーIDでコメント検索
-^^^^^^^^^^^^^^^^^^^^^^^^
-あるユーザーが投稿したコメントを検索します。
+In this section, we search comments which are posted by specific user.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-8.log
-.. select --table Comments --query posted_by:tasukuchan --output_columns comment --drilldown hash_tags
+.. include:: ../example/tutorial/micro_blog_posted_by.log
+.. select --table Comments --query posted_by:bob --output_columns comment --drilldown hash_tags
 
-「グニャラくん」が書き込んだ4件のコメントがヒットしました。また、ハッシュタグでドリルダウンした結果も返ってきており、ハッシュタグは「#groonga」が2つに「#travel」が1つあることがわかります。
+Above query returns 4 comments which are posted by Bob.
+It also returns result of drilldown by hash tags. There are 2 comments which contains #groonga, and 1 comment which contains #travel as hash tag.
 
-ユーザーのお気に入りコメントを検索
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-あるユーザーがお気に入りに入れているコメントを検索します。
+Search user's favorite comments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this section, we search user's favorite comments.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-9.log
-.. select --table Users --query _key:tasukuchan --output_columns favorites.posted_by,favorites.comment
+.. include:: ../example/tutorial/micro_blog_favorite.log
+.. select --table Users --query _key:bob --output_columns favorites.posted_by,favorites.comment
+
+Above query returns Bob's favorite comments.
+
+Search comments by posted time
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-「グニャラくん」がお気に入りに入れている2件のコメントがヒットしました。
+In this section, we search comments by posted time.
+See type of `Time` in :doc:`data`.
 
-投稿時間でコメント検索
-^^^^^^^^^^^^^^^^^^^^^^
-コメントの投稿時間で検索をします。Time型については :doc:`data` で扱っています。
-この例では、指定した時間よりも前に投稿されているコメントを検索します。
+Let's search comments that posted time are older than specified time.
 
 .. groonga-command
-.. include:: ../example/tutorial/micro_blog-10.log
+.. include:: ../example/tutorial/micro_blog_last_modified.log
 .. select Comments --filter 'last_modified<=1268802000' --output_columns posted_by.name,comment,last_modified --drilldown hash_tags,posted_by
 
-2010/03/17 14:00:00以前に書かれたコメント5件がヒットしました。また、ドリルダウンの結果も返ってきており、「hsiomaneki」が2件、「グニャラくん」が3件ヒットしていることがわかります。
+Above query returns 5 comments which are older than 2010/03/17 14:00:00.
+It also returns result of drilldown by posted person. There are 2 comments by Alice, 3 comments by Bob.
 
 .. TODO: 以下の機能はgroonga本体での支援が必要。
 .. タイムライン表示: あるユーザがfollowしているユーザの発言を、時系列順の逆順で並べて10件のみ表示。