[Groonga-commit] groonga/groonga [master] [doc] move doc/source/ja/ to doc/source/ and use Sphinx 1.1pre.

Back to archive index

null+****@clear***** null+****@clear*****
2011年 5月 7日 (土) 15:22:43 JST


Kouhei Sutou	2011-05-07 06:22:43 +0000 (Sat, 07 May 2011)

  New Revision: 3b722b266b32e0779cf6aff8e0b1ebf61ec6304d

  Log:
    [doc] move doc/source/ja/ to doc/source/ and use Sphinx 1.1pre.

  Removed files:
    doc/ja/Makefile.am
  Modified files:
    .gitignore
    configure.ac
    doc/Makefile.am
  Renamed files:
    doc/API.rd
      (from doc/ja/API.rd)
    doc/README
      (from doc/ja/README)
    doc/source/__init__.py
      (from doc/ja/source/__init__.py)
    doc/source/characteristic.txt
      (from doc/ja/source/characteristic.txt)
    doc/source/command_version.txt
      (from doc/ja/source/command_version.txt)
    doc/source/commands.txt
      (from doc/ja/source/commands.txt)
    doc/source/commands/cache_limit.txt
      (from doc/ja/source/commands/cache_limit.txt)
    doc/source/commands/check.txt
      (from doc/ja/source/commands/check.txt)
    doc/source/commands/clearlock.txt
      (from doc/ja/source/commands/clearlock.txt)
    doc/source/commands/column_create.txt
      (from doc/ja/source/commands/column_create.txt)
    doc/source/commands/column_list.txt
      (from doc/ja/source/commands/column_list.txt)
    doc/source/commands/column_remove.txt
      (from doc/ja/source/commands/column_remove.txt)
    doc/source/commands/define_selector.txt
      (from doc/ja/source/commands/define_selector.txt)
    doc/source/commands/defrag.txt
      (from doc/ja/source/commands/defrag.txt)
    doc/source/commands/delete.txt
      (from doc/ja/source/commands/delete.txt)
    doc/source/commands/dump.txt
      (from doc/ja/source/commands/dump.txt)
    doc/source/commands/load.txt
      (from doc/ja/source/commands/load.txt)
    doc/source/commands/log_level.txt
      (from doc/ja/source/commands/log_level.txt)
    doc/source/commands/log_put.txt
      (from doc/ja/source/commands/log_put.txt)
    doc/source/commands/log_reopen.txt
      (from doc/ja/source/commands/log_reopen.txt)
    doc/source/commands/quit.txt
      (from doc/ja/source/commands/quit.txt)
    doc/source/commands/select.txt
      (from doc/ja/source/commands/select.txt)
    doc/source/commands/shutdown.txt
      (from doc/ja/source/commands/shutdown.txt)
    doc/source/commands/status.txt
      (from doc/ja/source/commands/status.txt)
    doc/source/commands/suggest.txt
      (from doc/ja/source/commands/suggest.txt)
    doc/source/commands/table_create.txt
      (from doc/ja/source/commands/table_create.txt)
    doc/source/commands/table_list.txt
      (from doc/ja/source/commands/table_list.txt)
    doc/source/commands/table_remove.txt
      (from doc/ja/source/commands/table_remove.txt)
    doc/source/commands/view_add.txt
      (from doc/ja/source/commands/view_add.txt)
    doc/source/commands_not_implemented/add.txt
      (from doc/ja/source/commands_not_implemented/add.txt)
    doc/source/commands_not_implemented/get.txt
      (from doc/ja/source/commands_not_implemented/get.txt)
    doc/source/commands_not_implemented/set.txt
      (from doc/ja/source/commands_not_implemented/set.txt)
    doc/source/conf.py
      (from doc/ja/source/conf.py)
    doc/source/developer.txt
      (from doc/ja/source/developer.txt)
    doc/source/developer/com.txt
      (from doc/ja/source/developer/com.txt)
    doc/source/developer/document.txt
      (from doc/ja/source/developer/document.txt)
    doc/source/developer/query.txt
      (from doc/ja/source/developer/query.txt)
    doc/source/developer/test.txt
      (from doc/ja/source/developer/test.txt)
    doc/source/example/tutorial01-1.log
      (from doc/ja/source/example/tutorial01-1.log)
    doc/source/example/tutorial01-10.log
      (from doc/ja/source/example/tutorial01-10.log)
    doc/source/example/tutorial01-11.log
      (from doc/ja/source/example/tutorial01-11.log)
    doc/source/example/tutorial01-12.log
      (from doc/ja/source/example/tutorial01-12.log)
    doc/source/example/tutorial01-13.log
      (from doc/ja/source/example/tutorial01-13.log)
    doc/source/example/tutorial01-14.log
      (from doc/ja/source/example/tutorial01-14.log)
    doc/source/example/tutorial01-15.log
      (from doc/ja/source/example/tutorial01-15.log)
    doc/source/example/tutorial01-16.log
      (from doc/ja/source/example/tutorial01-16.log)
    doc/source/example/tutorial01-17.log
      (from doc/ja/source/example/tutorial01-17.log)
    doc/source/example/tutorial01-2.log
      (from doc/ja/source/example/tutorial01-2.log)
    doc/source/example/tutorial01-3.log
      (from doc/ja/source/example/tutorial01-3.log)
    doc/source/example/tutorial01-4.log
      (from doc/ja/source/example/tutorial01-4.log)
    doc/source/example/tutorial01-5.log
      (from doc/ja/source/example/tutorial01-5.log)
    doc/source/example/tutorial01-6.log
      (from doc/ja/source/example/tutorial01-6.log)
    doc/source/example/tutorial01-7.log
      (from doc/ja/source/example/tutorial01-7.log)
    doc/source/example/tutorial01-8.log
      (from doc/ja/source/example/tutorial01-8.log)
    doc/source/example/tutorial01-9.log
      (from doc/ja/source/example/tutorial01-9.log)
    doc/source/example/tutorial02-1.log
      (from doc/ja/source/example/tutorial02-1.log)
    doc/source/example/tutorial02-2.log
      (from doc/ja/source/example/tutorial02-2.log)
    doc/source/example/tutorial02-3.log
      (from doc/ja/source/example/tutorial02-3.log)
    doc/source/example/tutorial03-1.log
      (from doc/ja/source/example/tutorial03-1.log)
    doc/source/example/tutorial03-2.log
      (from doc/ja/source/example/tutorial03-2.log)
    doc/source/example/tutorial03-3.log
      (from doc/ja/source/example/tutorial03-3.log)
    doc/source/example/tutorial04-1.log
      (from doc/ja/source/example/tutorial04-1.log)
    doc/source/example/tutorial04-2.log
      (from doc/ja/source/example/tutorial04-2.log)
    doc/source/example/tutorial04-3.log
      (from doc/ja/source/example/tutorial04-3.log)
    doc/source/example/tutorial04-4.log
      (from doc/ja/source/example/tutorial04-4.log)
    doc/source/example/tutorial04-5.log
      (from doc/ja/source/example/tutorial04-5.log)
    doc/source/example/tutorial04-6.log
      (from doc/ja/source/example/tutorial04-6.log)
    doc/source/example/tutorial04-7.log
      (from doc/ja/source/example/tutorial04-7.log)
    doc/source/example/tutorial05-1.log
      (from doc/ja/source/example/tutorial05-1.log)
    doc/source/example/tutorial05-2.log
      (from doc/ja/source/example/tutorial05-2.log)
    doc/source/example/tutorial05-3.log
      (from doc/ja/source/example/tutorial05-3.log)
    doc/source/example/tutorial05-4.log
      (from doc/ja/source/example/tutorial05-4.log)
    doc/source/example/tutorial05-5.log
      (from doc/ja/source/example/tutorial05-5.log)
    doc/source/example/tutorial05-6.log
      (from doc/ja/source/example/tutorial05-6.log)
    doc/source/example/tutorial06-1.log
      (from doc/ja/source/example/tutorial06-1.log)
    doc/source/example/tutorial06-2.log
      (from doc/ja/source/example/tutorial06-2.log)
    doc/source/example/tutorial06-3.log
      (from doc/ja/source/example/tutorial06-3.log)
    doc/source/example/tutorial06-4.log
      (from doc/ja/source/example/tutorial06-4.log)
    doc/source/example/tutorial06-5.log
      (from doc/ja/source/example/tutorial06-5.log)
    doc/source/example/tutorial06-6.log
      (from doc/ja/source/example/tutorial06-6.log)
    doc/source/example/tutorial06-7.log
      (from doc/ja/source/example/tutorial06-7.log)
    doc/source/example/tutorial07-1.log
      (from doc/ja/source/example/tutorial07-1.log)
    doc/source/example/tutorial07-2.log
      (from doc/ja/source/example/tutorial07-2.log)
    doc/source/example/tutorial07-3.log
      (from doc/ja/source/example/tutorial07-3.log)
    doc/source/example/tutorial07-4.log
      (from doc/ja/source/example/tutorial07-4.log)
    doc/source/example/tutorial08-1.log
      (from doc/ja/source/example/tutorial08-1.log)
    doc/source/example/tutorial10-1.log
      (from doc/ja/source/example/tutorial10-1.log)
    doc/source/example/tutorial10-10.log
      (from doc/ja/source/example/tutorial10-10.log)
    doc/source/example/tutorial10-2.log
      (from doc/ja/source/example/tutorial10-2.log)
    doc/source/example/tutorial10-3.log
      (from doc/ja/source/example/tutorial10-3.log)
    doc/source/example/tutorial10-4.log
      (from doc/ja/source/example/tutorial10-4.log)
    doc/source/example/tutorial10-5.log
      (from doc/ja/source/example/tutorial10-5.log)
    doc/source/example/tutorial10-6.log
      (from doc/ja/source/example/tutorial10-6.log)
    doc/source/example/tutorial10-7.log
      (from doc/ja/source/example/tutorial10-7.log)
    doc/source/example/tutorial10-8.log
      (from doc/ja/source/example/tutorial10-8.log)
    doc/source/example/tutorial10-9.log
      (from doc/ja/source/example/tutorial10-9.log)
    doc/source/execfile.txt
      (from doc/ja/source/execfile.txt)
    doc/source/expr.txt
      (from doc/ja/source/expr.txt)
    doc/source/functions.txt
      (from doc/ja/source/functions.txt)
    doc/source/functions/edit_distance.txt
      (from doc/ja/source/functions/edit_distance.txt)
    doc/source/functions/geo_distance.txt
      (from doc/ja/source/functions/geo_distance.txt)
    doc/source/functions/geo_in_circle.txt
      (from doc/ja/source/functions/geo_in_circle.txt)
    doc/source/functions/geo_in_rectangle.txt
      (from doc/ja/source/functions/geo_in_rectangle.txt)
    doc/source/functions/now.txt
      (from doc/ja/source/functions/now.txt)
    doc/source/functions/rand.txt
      (from doc/ja/source/functions/rand.txt)
    doc/source/grnslap.txt
      (from doc/ja/source/grnslap.txt)
    doc/source/grntest.txt
      (from doc/ja/source/grntest.txt)
    doc/source/http.txt
      (from doc/ja/source/http.txt)
    doc/source/index.txt
      (from doc/ja/source/index.txt)
    doc/source/install.txt
      (from doc/ja/source/install.txt)
    doc/source/limitations.txt
      (from doc/ja/source/limitations.txt)
    doc/source/news.txt
      (from doc/ja/source/news.txt)
    doc/source/process.txt
      (from doc/ja/source/process.txt)
    doc/source/pseudo_column.txt
      (from doc/ja/source/pseudo_column.txt)
    doc/source/rdoc.py
      (from doc/ja/source/rdoc.py)
    doc/source/reference.txt
      (from doc/ja/source/reference.txt)
    doc/source/spec.txt
      (from doc/ja/source/spec.txt)
    doc/source/spec/search.txt
      (from doc/ja/source/spec/search.txt)
    doc/source/textile.py
      (from doc/ja/source/textile.py)
    doc/source/troubleshooting.txt
      (from doc/ja/source/troubleshooting.txt)
    doc/source/troubleshooting/different_results_with_the_same_keyword.txt
      (from doc/ja/source/troubleshooting/different_results_with_the_same_keyword.txt)
    doc/source/tutorial.txt
      (from doc/ja/source/tutorial.txt)
    doc/source/tutorial/tutorial01.txt
      (from doc/ja/source/tutorial/tutorial01.txt)
    doc/source/tutorial/tutorial02.txt
      (from doc/ja/source/tutorial/tutorial02.txt)
    doc/source/tutorial/tutorial03.txt
      (from doc/ja/source/tutorial/tutorial03.txt)
    doc/source/tutorial/tutorial04.txt
      (from doc/ja/source/tutorial/tutorial04.txt)
    doc/source/tutorial/tutorial05.txt
      (from doc/ja/source/tutorial/tutorial05.txt)
    doc/source/tutorial/tutorial06.txt
      (from doc/ja/source/tutorial/tutorial06.txt)
    doc/source/tutorial/tutorial07.txt
      (from doc/ja/source/tutorial/tutorial07.txt)
    doc/source/tutorial/tutorial08.txt
      (from doc/ja/source/tutorial/tutorial08.txt)
    doc/source/tutorial/tutorial09.txt
      (from doc/ja/source/tutorial/tutorial09.txt)
    doc/source/tutorial/tutorial10.txt
      (from doc/ja/source/tutorial/tutorial10.txt)
    doc/source/type.txt
      (from doc/ja/source/type.txt)
    doc/source/update_execution_example.py
      (from doc/ja/source/update_execution_example.py)

  Modified: .gitignore (+13 -12)
===================================================================
--- .gitignore    2011-05-06 09:29:45 +0000 (1713efe)
+++ .gitignore    2011-05-07 06:22:43 +0000 (85c569a)
@@ -38,18 +38,19 @@ Makefile.in
 version.sh
 /examples/kv
 /examples/index
-/doc/ja/doctrees/
-/doc/ja/html/
-/doc/ja/rdoc/
-/doc/ja/man/
-/doc/ja/pickle/
-/doc/ja/textile/
-/doc/ja/.buildinfo
-/doc/ja/_sources/
-/doc/ja/_static/
-/doc/ja/build/
-/doc/ja/commands_not_implemented/
-/doc/ja/objects.inv
+/doc/doctrees/
+/doc/html/
+/doc/rdoc/
+/doc/man/
+/doc/pickle/
+/doc/textile/
+/doc/.buildinfo
+/doc/_sources/
+/doc/_static/
+/doc/build/
+/doc/commands_not_implemented/
+/doc/objects.inv
+/doc/sphinx/
 /lib/icudump
 /coverage
 /coverage.info

  Modified: configure.ac (+18 -57)
===================================================================
--- configure.ac    2011-05-06 09:29:45 +0000 (c6f3390)
+++ configure.ac    2011-05-07 06:22:43 +0000 (d8950da)
@@ -123,7 +123,6 @@ AC_CONFIG_FILES([Makefile
                  data/init.d/redhat/sysconfig/Makefile
                  tools/Makefile
                  doc/Makefile
-                 doc/ja/Makefile
                  test/Makefile
                  test/unit/Makefile
                  test/unit/lib/Makefile
@@ -243,9 +242,6 @@ AC_ARG_ENABLE(uyield,
     [build for detecting race conditions. [default=no]])],
   ,
   [enable_uyield="no"])
-if test "x$enable_uyield" != "xno"; then
-  AC_DEFINE(USE_UYIELD, [1], [use uyield])
-fi
 AC_MSG_RESULT($enable_uyield)
 
 ## malloc
@@ -708,58 +704,24 @@ AM_CONDITIONAL([ENABLE_SUGGEST_LEARNER],
                      "$libevent_available" = "yes" -a \
                      "$message_pack_available" = "yes"])
 
-# check sphinx-build for documentation
-ac_sphinx_available="no"
-sphinx_required_version="1.0.1"
-sphinx_required_version_major=$(echo $sphinx_required_version | cut -d. -f1)
-sphinx_required_version_minor=$(echo $sphinx_required_version | cut -d. -f2)
-sphinx_required_version_micro=$(echo $sphinx_required_version | cut -d. -f3)
-AC_ARG_WITH([sphinx_build],
-            AS_HELP_STRING([--with-sphinx-build=PATH],
-                           [sphinx-build path (default: auto-detect)]),
-            [SPHINX_BUILD="$withval"])
-
-if test "$SPHINX_BUILD" = "no"; then
-  : # ignore
-elif test "$SPHINX_BUILD" = ""; then
-  AC_PATH_PROG(SPHINX_BUILD, sphinx-build, none)
-  if test "$SPHINX_BUILD" != "none"; then
-    ac_sphinx_available="yes"
-  fi
+# Sphinx
+AC_MSG_CHECKING([whether enable Shpinx])
+enable_sphinx="no"
+AC_ARG_ENABLE(sphinx,
+  [AS_HELP_STRING([--enable-shpinx],
+    [enable document generation by Sphinx. [default=no]])],,
+  [enable_sphinx="no"])
+if text "$enable_sphinx"; then
+  : # TODO check hg availability.
+fi
+if test "$enable_sphinx" = "yes" -o -f "$srcdir/doc/man-build-stamp"; then
+  enable_document=yes
 else
-  AC_CHECK_FILE([$SPHINX_BUILD],
-                [ac_sphinx_available="yes"],
-                [AC_MSG_WARN([$SPHINX_BUILD is not found. Disable document gerataion.])])
-fi
-if test "$ac_sphinx_available" = "yes"; then
-  sphinx_build_version=$($SPHINX_BUILD 2>&1 | head -1 | $SED -e 's/^Sphinx v//')
-  sphinx_build_version_major=$(echo $sphinx_build_version | cut -d. -f1)
-  sphinx_build_version_minor=$(echo $sphinx_build_version | cut -d. -f2)
-  sphinx_build_version_micro=$(echo $sphinx_build_version | cut -d. -f3)
-  if test \
-       \( "$sphinx_build_version_major" -gt \
-             "$sphinx_required_version_major" \) -o \
-       \( "$sphinx_build_version_major" -eq \
-             "$sphinx_required_version_major" -a \
-          "$sphinx_build_version_minor" -gt \
-             "$sphinx_required_version_minor" \) -o \
-       \( "$sphinx_build_version_major" -eq \
-             "$sphinx_required_version_major" -a \
-          "$sphinx_build_version_minor" -eq \
-             "$sphinx_required_version_minor" -a \
-          "$sphinx_build_version_micro" -ge \
-             "$sphinx_required_version_micro" \); then
-    :
-  else
-    ac_sphinx_available="no"
-  fi
+  enable_document=no
 fi
-AC_SUBST(SPHINX_BUILD)
 AM_CONDITIONAL([ENABLE_DOCUMENT],
-               [test "$ac_sphinx_available" = "yes" -o \
-                     -f "$srcdir/doc/ja/man-build-stamp"])
-AC_MSG_CHECKING([for sphinx availablity])
-AC_MSG_RESULT($ac_sphinx_available (sphinx-build=$SPHINX_BUILD version=$sphinx_build_version required=$sphinx_required_version))
+               [test "$enable_document" = "yes"])
+AC_MSG_RESULT($enable_sphinx)
 
 # plugins check
 relative_pluginsdir="\$(PACKAGE)/plugins"
@@ -834,6 +796,7 @@ echo "-----------------------"
 echo "  Compiler:              ${CC}"
 echo "  CFLAGS:                ${CFLAGS}"
 echo "  Libraries:             ${LIBS}"
+echo "  Documentation:         ${enable_document}"
 echo
 echo "Paths:"
 echo "  Install path prefix:   ${prefix}"
@@ -867,10 +830,8 @@ fi
 echo
 
 echo "Tools:"
-echo "  Sphinx:                 $ac_sphinx_available"
-if test "x$ac_sphinx_available" = "xyes"; then
-  echo "    sphinx-build:         $SPHINX_BUILD ($sphinx_build_version)"
-fi
+echo "  Sphinx:                 $enable_sphinx"
+# echo "hg:  ${HG}"
 echo
 
 echo "Now type 'make' to build $PACKAGE_NAME $PACKAGE_VERSION!"

  Renamed: doc/API.rd (+0 -0) 100%
===================================================================

  Modified: doc/Makefile.am (+457 -1)
===================================================================
--- doc/Makefile.am    2011-05-06 09:29:45 +0000 (38057c6)
+++ doc/Makefile.am    2011-05-07 06:22:43 +0000 (e1af0fc)
@@ -1 +1,457 @@
-SUBDIRS = ja
+docdir = $(pkgdatadir)/doc
+
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+PAPER         =
+BUILDDIR      = .
+DOCTREES_BASE = $(BUILDDIR)/doctrees
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: sphinx-ensure-updated help clean man html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+SPHINX_BUILD = sphinx/sphinx-build.py
+SPHINX_BUILD_COMMAND = PYTHONPATH="$(abs_builddir)/sphinx:$$PYTHONPATH" python $(SPHINX_BUILD)
+
+sphinx-ensure-updated:
+	if [ -f $(SPHINX_BUILD) ]; then					\
+		if ! $(SPHINX_BUILD_COMMAND) 2>&1 | head -1 |		\
+		  grep v1.1 -q > /dev/null; then			\
+			hg pull sphinx;					\
+		fi;							\
+	else								\
+		hg clone https://bitbucket.org/birkenfeld/sphinx;	\
+	fi
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  man       to make man files"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  rdoc      to make RDoc files"
+	@echo "  textile   to make Textile files"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean-local:
+	-rm -rf $(DOCTREES_BASE)
+	-rm -rf $(BUILDDIR)/man
+	-rm -rf $(BUILDDIR)/html
+	-rm -rf $(BUILDDIR)/dirhtml
+	-rm -rf $(BUILDDIR)/pickle
+	-rm -rf $(BUILDDIR)/json
+	-rm -rf $(BUILDDIR)/htmlhelp
+	-rm -rf $(BUILDDIR)/qthelp
+	-rm -rf $(BUILDDIR)/latex
+	-rm -rf $(BUILDDIR)/rdoc
+	-rm -rf $(BUILDDIR)/textile
+	-rm -rf $(BUILDDIR)/changes
+	-rm -rf $(BUILDDIR)/linkcheck
+	-rm -rf $(BUILDDIR)/doctest
+	-rm -rf $(BUILDDIR)/pdf
+
+man: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -d $(DOCTREES_BASE)/man -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The man pages are in $(BUILDDIR)/man."
+
+html: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -d $(DOCTREES_BASE)/html -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/groonga.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/groonga.qhc"
+
+latex: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+rdoc: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b rdoc $(ALLSPHINXOPTS) $(BUILDDIR)/rdoc
+	@echo
+	@echo "Build finished; the RDoc files are in $(BUILDDIR)/rdoc."
+
+textile: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b textile $(ALLSPHINXOPTS) $(BUILDDIR)/textile
+	@echo
+	@echo "Build finished; the Textile files are in $(BUILDDIR)/textile."
+
+changes: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+pdf: sphinx-ensure-updated
+	$(SPHINX_BUILD_COMMAND) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf
+	@echo
+	@echo "Build finished. The PDF files are in $(BUILDDIR)/pdf."
+
+update-examples:
+	GROONGA=$(GROONGA) $(srcdir)/source/update_execution_example.py
+
+if ENABLE_DOCUMENT
+dist-hook:
+	@touch $(distdir)/man-build-stamp
+	@touch $(distdir)/html-build-stamp
+
+dist_man1_MANS =				\
+	man/groonga.1
+
+$(dist_man1_MANS): man-build-stamp
+man-build-stamp:
+	$(MAKE) man
+
+nobase_dist_doc_DATA =				\
+	$(source_files)				\
+	$(html_files)
+
+# find source -type f -not -name '*.pyc' | sort | sed -e 's,^,\t,g'
+source_files =					\
+	source/__init__.py							\
+	source/characteristic.txt						\
+	source/command_version.txt						\
+	source/commands.txt							\
+	source/commands/cache_limit.txt						\
+	source/commands/check.txt						\
+	source/commands/clearlock.txt						\
+	source/commands/column_create.txt					\
+	source/commands/column_list.txt						\
+	source/commands/column_remove.txt					\
+	source/commands/define_selector.txt					\
+	source/commands/defrag.txt						\
+	source/commands/delete.txt						\
+	source/commands/dump.txt						\
+	source/commands/load.txt						\
+	source/commands/log_level.txt						\
+	source/commands/log_put.txt						\
+	source/commands/log_reopen.txt						\
+	source/commands/quit.txt						\
+	source/commands/select.txt						\
+	source/commands/shutdown.txt						\
+	source/commands/status.txt						\
+	source/commands/suggest.txt						\
+	source/commands/table_create.txt					\
+	source/commands/table_list.txt						\
+	source/commands/table_remove.txt					\
+	source/commands/view_add.txt						\
+	source/commands_not_implemented/add.txt					\
+	source/commands_not_implemented/get.txt					\
+	source/commands_not_implemented/set.txt					\
+	source/conf.py								\
+	source/developer.txt							\
+	source/developer/com.txt						\
+	source/developer/document.txt						\
+	source/developer/query.txt						\
+	source/developer/test.txt						\
+	source/example/tutorial01-1.log						\
+	source/example/tutorial01-10.log					\
+	source/example/tutorial01-11.log					\
+	source/example/tutorial01-12.log					\
+	source/example/tutorial01-13.log					\
+	source/example/tutorial01-14.log					\
+	source/example/tutorial01-15.log					\
+	source/example/tutorial01-16.log					\
+	source/example/tutorial01-17.log					\
+	source/example/tutorial01-2.log						\
+	source/example/tutorial01-3.log						\
+	source/example/tutorial01-4.log						\
+	source/example/tutorial01-5.log						\
+	source/example/tutorial01-6.log						\
+	source/example/tutorial01-7.log						\
+	source/example/tutorial01-8.log						\
+	source/example/tutorial01-9.log						\
+	source/example/tutorial02-1.log						\
+	source/example/tutorial02-2.log						\
+	source/example/tutorial02-3.log						\
+	source/example/tutorial03-1.log						\
+	source/example/tutorial03-2.log						\
+	source/example/tutorial03-3.log						\
+	source/example/tutorial04-1.log						\
+	source/example/tutorial04-2.log						\
+	source/example/tutorial04-3.log						\
+	source/example/tutorial04-4.log						\
+	source/example/tutorial04-5.log						\
+	source/example/tutorial04-6.log						\
+	source/example/tutorial04-7.log						\
+	source/example/tutorial05-1.log						\
+	source/example/tutorial05-2.log						\
+	source/example/tutorial05-3.log						\
+	source/example/tutorial05-4.log						\
+	source/example/tutorial05-5.log						\
+	source/example/tutorial05-6.log						\
+	source/example/tutorial06-1.log						\
+	source/example/tutorial06-2.log						\
+	source/example/tutorial06-3.log						\
+	source/example/tutorial06-4.log						\
+	source/example/tutorial06-5.log						\
+	source/example/tutorial06-6.log						\
+	source/example/tutorial06-7.log						\
+	source/example/tutorial07-1.log						\
+	source/example/tutorial07-2.log						\
+	source/example/tutorial07-3.log						\
+	source/example/tutorial07-4.log						\
+	source/example/tutorial08-1.log						\
+	source/example/tutorial10-1.log						\
+	source/example/tutorial10-10.log					\
+	source/example/tutorial10-2.log						\
+	source/example/tutorial10-3.log						\
+	source/example/tutorial10-4.log						\
+	source/example/tutorial10-5.log						\
+	source/example/tutorial10-6.log						\
+	source/example/tutorial10-7.log						\
+	source/example/tutorial10-8.log						\
+	source/example/tutorial10-9.log						\
+	source/execfile.txt							\
+	source/expr.txt								\
+	source/functions.txt							\
+	source/functions/edit_distance.txt					\
+	source/functions/geo_distance.txt					\
+	source/functions/geo_in_circle.txt					\
+	source/functions/geo_in_rectangle.txt					\
+	source/functions/now.txt						\
+	source/functions/rand.txt						\
+	source/grnslap.txt							\
+	source/grntest.txt							\
+	source/http.txt								\
+	source/index.txt							\
+	source/install.txt							\
+	source/limitations.txt							\
+	source/news.txt								\
+	source/process.txt							\
+	source/pseudo_column.txt						\
+	source/rdoc.py								\
+	source/reference.txt							\
+	source/spec.txt								\
+	source/spec/search.txt							\
+	source/textile.py							\
+	source/troubleshooting.txt						\
+	source/troubleshooting/different_results_with_the_same_keyword.txt	\
+	source/tutorial.txt							\
+	source/tutorial/tutorial01.txt						\
+	source/tutorial/tutorial02.txt						\
+	source/tutorial/tutorial03.txt						\
+	source/tutorial/tutorial04.txt						\
+	source/tutorial/tutorial05.txt						\
+	source/tutorial/tutorial06.txt						\
+	source/tutorial/tutorial07.txt						\
+	source/tutorial/tutorial08.txt						\
+	source/tutorial/tutorial09.txt						\
+	source/tutorial/tutorial10.txt						\
+	source/type.txt								\
+	source/update_execution_example.py
+
+# find html -type f | sort | sed -e 's,^,\t,g'
+html_files =									  \
+	html/.buildinfo								  \
+	html/_sources/characteristic.txt					  \
+	html/_sources/command_version.txt					  \
+	html/_sources/commands.txt						  \
+	html/_sources/commands/cache_limit.txt					  \
+	html/_sources/commands/check.txt					  \
+	html/_sources/commands/clearlock.txt					  \
+	html/_sources/commands/column_create.txt				  \
+	html/_sources/commands/column_list.txt					  \
+	html/_sources/commands/column_remove.txt				  \
+	html/_sources/commands/define_selector.txt				  \
+	html/_sources/commands/defrag.txt					  \
+	html/_sources/commands/delete.txt					  \
+	html/_sources/commands/dump.txt						  \
+	html/_sources/commands/load.txt						  \
+	html/_sources/commands/log_level.txt					  \
+	html/_sources/commands/log_put.txt					  \
+	html/_sources/commands/log_reopen.txt					  \
+	html/_sources/commands/quit.txt						  \
+	html/_sources/commands/select.txt					  \
+	html/_sources/commands/shutdown.txt					  \
+	html/_sources/commands/status.txt					  \
+	html/_sources/commands/suggest.txt					  \
+	html/_sources/commands/table_create.txt					  \
+	html/_sources/commands/table_list.txt					  \
+	html/_sources/commands/table_remove.txt					  \
+	html/_sources/commands/view_add.txt					  \
+	html/_sources/commands_not_implemented/add.txt				  \
+	html/_sources/commands_not_implemented/get.txt				  \
+	html/_sources/commands_not_implemented/set.txt				  \
+	html/_sources/developer.txt						  \
+	html/_sources/developer/com.txt						  \
+	html/_sources/developer/document.txt					  \
+	html/_sources/developer/query.txt					  \
+	html/_sources/developer/test.txt					  \
+	html/_sources/execfile.txt						  \
+	html/_sources/expr.txt							  \
+	html/_sources/functions.txt						  \
+	html/_sources/functions/edit_distance.txt				  \
+	html/_sources/functions/geo_distance.txt				  \
+	html/_sources/functions/geo_in_circle.txt				  \
+	html/_sources/functions/geo_in_rectangle.txt				  \
+	html/_sources/functions/now.txt						  \
+	html/_sources/functions/rand.txt					  \
+	html/_sources/grnslap.txt						  \
+	html/_sources/grntest.txt						  \
+	html/_sources/http.txt							  \
+	html/_sources/index.txt							  \
+	html/_sources/install.txt						  \
+	html/_sources/limitations.txt						  \
+	html/_sources/news.txt							  \
+	html/_sources/process.txt						  \
+	html/_sources/pseudo_column.txt						  \
+	html/_sources/reference.txt						  \
+	html/_sources/spec.txt							  \
+	html/_sources/spec/search.txt						  \
+	html/_sources/troubleshooting.txt					  \
+	html/_sources/troubleshooting/different_results_with_the_same_keyword.txt \
+	html/_sources/tutorial.txt						  \
+	html/_sources/tutorial/tutorial01.txt					  \
+	html/_sources/tutorial/tutorial02.txt					  \
+	html/_sources/tutorial/tutorial03.txt					  \
+	html/_sources/tutorial/tutorial04.txt					  \
+	html/_sources/tutorial/tutorial05.txt					  \
+	html/_sources/tutorial/tutorial06.txt					  \
+	html/_sources/tutorial/tutorial07.txt					  \
+	html/_sources/tutorial/tutorial08.txt					  \
+	html/_sources/tutorial/tutorial09.txt					  \
+	html/_sources/tutorial/tutorial10.txt					  \
+	html/_sources/type.txt							  \
+	html/_static/basic.css							  \
+	html/_static/default.css						  \
+	html/_static/doctools.js						  \
+	html/_static/file.png							  \
+	html/_static/jquery.js							  \
+	html/_static/minus.png							  \
+	html/_static/plus.png							  \
+	html/_static/pygments.css						  \
+	html/_static/searchtools.js						  \
+	html/_static/sidebar.js							  \
+	html/_static/underscore.js						  \
+	html/characteristic.html						  \
+	html/command_version.html						  \
+	html/commands.html							  \
+	html/commands/cache_limit.html						  \
+	html/commands/check.html						  \
+	html/commands/clearlock.html						  \
+	html/commands/column_create.html					  \
+	html/commands/column_list.html						  \
+	html/commands/column_remove.html					  \
+	html/commands/define_selector.html					  \
+	html/commands/defrag.html						  \
+	html/commands/delete.html						  \
+	html/commands/dump.html							  \
+	html/commands/load.html							  \
+	html/commands/log_level.html						  \
+	html/commands/log_put.html						  \
+	html/commands/log_reopen.html						  \
+	html/commands/quit.html							  \
+	html/commands/select.html						  \
+	html/commands/shutdown.html						  \
+	html/commands/status.html						  \
+	html/commands/suggest.html						  \
+	html/commands/table_create.html						  \
+	html/commands/table_list.html						  \
+	html/commands/table_remove.html						  \
+	html/commands/view_add.html						  \
+	html/commands_not_implemented/add.html					  \
+	html/commands_not_implemented/get.html					  \
+	html/commands_not_implemented/set.html					  \
+	html/developer.html							  \
+	html/developer/com.html							  \
+	html/developer/document.html						  \
+	html/developer/query.html						  \
+	html/developer/test.html						  \
+	html/execfile.html							  \
+	html/expr.html								  \
+	html/functions.html							  \
+	html/functions/edit_distance.html					  \
+	html/functions/geo_distance.html					  \
+	html/functions/geo_in_circle.html					  \
+	html/functions/geo_in_rectangle.html					  \
+	html/functions/now.html							  \
+	html/functions/rand.html						  \
+	html/genindex.html							  \
+	html/grnslap.html							  \
+	html/grntest.html							  \
+	html/http.html								  \
+	html/index.html								  \
+	html/install.html							  \
+	html/limitations.html							  \
+	html/news.html								  \
+	html/objects.inv							  \
+	html/process.html							  \
+	html/pseudo_column.html							  \
+	html/reference.html							  \
+	html/search.html							  \
+	html/searchindex.js							  \
+	html/spec.html								  \
+	html/spec/search.html							  \
+	html/troubleshooting.html						  \
+	html/troubleshooting/different_results_with_the_same_keyword.html	  \
+	html/tutorial.html							  \
+	html/tutorial/tutorial01.html						  \
+	html/tutorial/tutorial02.html						  \
+	html/tutorial/tutorial03.html						  \
+	html/tutorial/tutorial04.html						  \
+	html/tutorial/tutorial05.html						  \
+	html/tutorial/tutorial06.html						  \
+	html/tutorial/tutorial07.html						  \
+	html/tutorial/tutorial08.html						  \
+	html/tutorial/tutorial09.html						  \
+	html/tutorial/tutorial10.html						  \
+	html/type.html
+
+$(html_files): html-build-stamp
+html-build-stamp:
+	$(MAKE) html
+endif

  Renamed: doc/README (+0 -0) 100%
===================================================================

  Deleted: doc/ja/Makefile.am (+0 -445) 100644
===================================================================
--- doc/ja/Makefile.am    2011-05-06 09:29:45 +0000 (9f3b5e9)
+++ /dev/null
@@ -1,445 +0,0 @@
-docdir = $(pkgdatadir)/doc
-doc_jadir = $(docdir)/ja
-
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-PAPER         =
-BUILDDIR      = .
-DOCTREES_BASE = $(BUILDDIR)/doctrees
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean man html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  man       to make man files"
-	@echo "  html      to make standalone HTML files"
-	@echo "  dirhtml   to make HTML files named index.html in directories"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
-	@echo "  htmlhelp  to make HTML files and a HTML help project"
-	@echo "  qthelp    to make HTML files and a qthelp project"
-	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  rdoc      to make RDoc files"
-	@echo "  textile   to make Textile files"
-	@echo "  changes   to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
-	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
-
-clean-local:
-	-rm -rf $(DOCTREES_BASE)
-	-rm -rf $(BUILDDIR)/man
-	-rm -rf $(BUILDDIR)/html
-	-rm -rf $(BUILDDIR)/dirhtml
-	-rm -rf $(BUILDDIR)/pickle
-	-rm -rf $(BUILDDIR)/json
-	-rm -rf $(BUILDDIR)/htmlhelp
-	-rm -rf $(BUILDDIR)/qthelp
-	-rm -rf $(BUILDDIR)/latex
-	-rm -rf $(BUILDDIR)/rdoc
-	-rm -rf $(BUILDDIR)/textile
-	-rm -rf $(BUILDDIR)/changes
-	-rm -rf $(BUILDDIR)/linkcheck
-	-rm -rf $(BUILDDIR)/doctest
-	-rm -rf $(BUILDDIR)/pdf
-
-man:
-	$(SPHINX_BUILD) -d $(DOCTREES_BASE)/man -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The man pages are in $(BUILDDIR)/man."
-
-html:
-	$(SPHINX_BUILD) -d $(DOCTREES_BASE)/html -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINX_BUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-pickle:
-	$(SPHINX_BUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINX_BUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINX_BUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINX_BUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/groonga.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/groonga.qhc"
-
-latex:
-	$(SPHINX_BUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
-
-rdoc:
-	$(SPHINX_BUILD) -b rdoc $(ALLSPHINXOPTS) $(BUILDDIR)/rdoc
-	@echo
-	@echo "Build finished; the RDoc files are in $(BUILDDIR)/rdoc."
-
-textile:
-	$(SPHINX_BUILD) -b textile $(ALLSPHINXOPTS) $(BUILDDIR)/textile
-	@echo
-	@echo "Build finished; the Textile files are in $(BUILDDIR)/textile."
-
-changes:
-	$(SPHINX_BUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINX_BUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINX_BUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-pdf:
-	$(SPHINX_BUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf
-	@echo
-	@echo "Build finished. The PDF files are in $(BUILDDIR)/pdf."
-
-update-examples:
-	GROONGA=$(GROONGA) $(srcdir)/source/update_execution_example.py
-
-if ENABLE_DOCUMENT
-dist-hook:
-	@touch $(distdir)/man-build-stamp
-	@touch $(distdir)/html-build-stamp
-
-dist_man1_MANS =				\
-	man/groonga.1
-
-$(dist_man1_MANS): man-build-stamp
-man-build-stamp:
-	$(MAKE) man
-
-nobase_dist_doc_ja_DATA =			\
-	$(source_files)				\
-	$(html_files)
-
-# find source -type f -not -name '*.pyc' | sort | sed -e 's,^,\t,g'
-source_files =					\
-	source/__init__.py							\
-	source/characteristic.txt						\
-	source/command_version.txt						\
-	source/commands.txt							\
-	source/commands/cache_limit.txt						\
-	source/commands/check.txt						\
-	source/commands/clearlock.txt						\
-	source/commands/column_create.txt					\
-	source/commands/column_list.txt						\
-	source/commands/column_remove.txt					\
-	source/commands/define_selector.txt					\
-	source/commands/defrag.txt						\
-	source/commands/delete.txt						\
-	source/commands/dump.txt						\
-	source/commands/load.txt						\
-	source/commands/log_level.txt						\
-	source/commands/log_put.txt						\
-	source/commands/log_reopen.txt						\
-	source/commands/quit.txt						\
-	source/commands/select.txt						\
-	source/commands/shutdown.txt						\
-	source/commands/status.txt						\
-	source/commands/suggest.txt						\
-	source/commands/table_create.txt					\
-	source/commands/table_list.txt						\
-	source/commands/table_remove.txt					\
-	source/commands/view_add.txt						\
-	source/commands_not_implemented/add.txt					\
-	source/commands_not_implemented/get.txt					\
-	source/commands_not_implemented/set.txt					\
-	source/conf.py								\
-	source/developer.txt							\
-	source/developer/com.txt						\
-	source/developer/document.txt						\
-	source/developer/query.txt						\
-	source/developer/test.txt						\
-	source/example/tutorial01-1.log						\
-	source/example/tutorial01-10.log					\
-	source/example/tutorial01-11.log					\
-	source/example/tutorial01-12.log					\
-	source/example/tutorial01-13.log					\
-	source/example/tutorial01-14.log					\
-	source/example/tutorial01-15.log					\
-	source/example/tutorial01-16.log					\
-	source/example/tutorial01-17.log					\
-	source/example/tutorial01-2.log						\
-	source/example/tutorial01-3.log						\
-	source/example/tutorial01-4.log						\
-	source/example/tutorial01-5.log						\
-	source/example/tutorial01-6.log						\
-	source/example/tutorial01-7.log						\
-	source/example/tutorial01-8.log						\
-	source/example/tutorial01-9.log						\
-	source/example/tutorial02-1.log						\
-	source/example/tutorial02-2.log						\
-	source/example/tutorial02-3.log						\
-	source/example/tutorial03-1.log						\
-	source/example/tutorial03-2.log						\
-	source/example/tutorial03-3.log						\
-	source/example/tutorial04-1.log						\
-	source/example/tutorial04-2.log						\
-	source/example/tutorial04-3.log						\
-	source/example/tutorial04-4.log						\
-	source/example/tutorial04-5.log						\
-	source/example/tutorial04-6.log						\
-	source/example/tutorial04-7.log						\
-	source/example/tutorial05-1.log						\
-	source/example/tutorial05-2.log						\
-	source/example/tutorial05-3.log						\
-	source/example/tutorial05-4.log						\
-	source/example/tutorial05-5.log						\
-	source/example/tutorial05-6.log						\
-	source/example/tutorial06-1.log						\
-	source/example/tutorial06-2.log						\
-	source/example/tutorial06-3.log						\
-	source/example/tutorial06-4.log						\
-	source/example/tutorial06-5.log						\
-	source/example/tutorial06-6.log						\
-	source/example/tutorial06-7.log						\
-	source/example/tutorial07-1.log						\
-	source/example/tutorial07-2.log						\
-	source/example/tutorial07-3.log						\
-	source/example/tutorial07-4.log						\
-	source/example/tutorial08-1.log						\
-	source/example/tutorial10-1.log						\
-	source/example/tutorial10-10.log					\
-	source/example/tutorial10-2.log						\
-	source/example/tutorial10-3.log						\
-	source/example/tutorial10-4.log						\
-	source/example/tutorial10-5.log						\
-	source/example/tutorial10-6.log						\
-	source/example/tutorial10-7.log						\
-	source/example/tutorial10-8.log						\
-	source/example/tutorial10-9.log						\
-	source/execfile.txt							\
-	source/expr.txt								\
-	source/functions.txt							\
-	source/functions/edit_distance.txt					\
-	source/functions/geo_distance.txt					\
-	source/functions/geo_in_circle.txt					\
-	source/functions/geo_in_rectangle.txt					\
-	source/functions/now.txt						\
-	source/functions/rand.txt						\
-	source/grnslap.txt							\
-	source/grntest.txt							\
-	source/http.txt								\
-	source/index.txt							\
-	source/install.txt							\
-	source/limitations.txt							\
-	source/news.txt								\
-	source/process.txt							\
-	source/pseudo_column.txt						\
-	source/rdoc.py								\
-	source/reference.txt							\
-	source/spec.txt								\
-	source/spec/search.txt							\
-	source/textile.py							\
-	source/troubleshooting.txt						\
-	source/troubleshooting/different_results_with_the_same_keyword.txt	\
-	source/tutorial.txt							\
-	source/tutorial/tutorial01.txt						\
-	source/tutorial/tutorial02.txt						\
-	source/tutorial/tutorial03.txt						\
-	source/tutorial/tutorial04.txt						\
-	source/tutorial/tutorial05.txt						\
-	source/tutorial/tutorial06.txt						\
-	source/tutorial/tutorial07.txt						\
-	source/tutorial/tutorial08.txt						\
-	source/tutorial/tutorial09.txt						\
-	source/tutorial/tutorial10.txt						\
-	source/type.txt								\
-	source/update_execution_example.py
-
-# find html -type f | sort | sed -e 's,^,\t,g'
-html_files =									  \
-	html/.buildinfo								  \
-	html/_sources/characteristic.txt					  \
-	html/_sources/command_version.txt					  \
-	html/_sources/commands.txt						  \
-	html/_sources/commands/cache_limit.txt					  \
-	html/_sources/commands/check.txt					  \
-	html/_sources/commands/clearlock.txt					  \
-	html/_sources/commands/column_create.txt				  \
-	html/_sources/commands/column_list.txt					  \
-	html/_sources/commands/column_remove.txt				  \
-	html/_sources/commands/define_selector.txt				  \
-	html/_sources/commands/defrag.txt					  \
-	html/_sources/commands/delete.txt					  \
-	html/_sources/commands/dump.txt						  \
-	html/_sources/commands/load.txt						  \
-	html/_sources/commands/log_level.txt					  \
-	html/_sources/commands/log_put.txt					  \
-	html/_sources/commands/log_reopen.txt					  \
-	html/_sources/commands/quit.txt						  \
-	html/_sources/commands/select.txt					  \
-	html/_sources/commands/shutdown.txt					  \
-	html/_sources/commands/status.txt					  \
-	html/_sources/commands/suggest.txt					  \
-	html/_sources/commands/table_create.txt					  \
-	html/_sources/commands/table_list.txt					  \
-	html/_sources/commands/table_remove.txt					  \
-	html/_sources/commands/view_add.txt					  \
-	html/_sources/commands_not_implemented/add.txt				  \
-	html/_sources/commands_not_implemented/get.txt				  \
-	html/_sources/commands_not_implemented/set.txt				  \
-	html/_sources/developer.txt						  \
-	html/_sources/developer/com.txt						  \
-	html/_sources/developer/document.txt					  \
-	html/_sources/developer/query.txt					  \
-	html/_sources/developer/test.txt					  \
-	html/_sources/execfile.txt						  \
-	html/_sources/expr.txt							  \
-	html/_sources/functions.txt						  \
-	html/_sources/functions/edit_distance.txt				  \
-	html/_sources/functions/geo_distance.txt				  \
-	html/_sources/functions/geo_in_circle.txt				  \
-	html/_sources/functions/geo_in_rectangle.txt				  \
-	html/_sources/functions/now.txt						  \
-	html/_sources/functions/rand.txt					  \
-	html/_sources/grnslap.txt						  \
-	html/_sources/grntest.txt						  \
-	html/_sources/http.txt							  \
-	html/_sources/index.txt							  \
-	html/_sources/install.txt						  \
-	html/_sources/limitations.txt						  \
-	html/_sources/news.txt							  \
-	html/_sources/process.txt						  \
-	html/_sources/pseudo_column.txt						  \
-	html/_sources/reference.txt						  \
-	html/_sources/spec.txt							  \
-	html/_sources/spec/search.txt						  \
-	html/_sources/troubleshooting.txt					  \
-	html/_sources/troubleshooting/different_results_with_the_same_keyword.txt \
-	html/_sources/tutorial.txt						  \
-	html/_sources/tutorial/tutorial01.txt					  \
-	html/_sources/tutorial/tutorial02.txt					  \
-	html/_sources/tutorial/tutorial03.txt					  \
-	html/_sources/tutorial/tutorial04.txt					  \
-	html/_sources/tutorial/tutorial05.txt					  \
-	html/_sources/tutorial/tutorial06.txt					  \
-	html/_sources/tutorial/tutorial07.txt					  \
-	html/_sources/tutorial/tutorial08.txt					  \
-	html/_sources/tutorial/tutorial09.txt					  \
-	html/_sources/tutorial/tutorial10.txt					  \
-	html/_sources/type.txt							  \
-	html/_static/basic.css							  \
-	html/_static/default.css						  \
-	html/_static/doctools.js						  \
-	html/_static/file.png							  \
-	html/_static/jquery.js							  \
-	html/_static/minus.png							  \
-	html/_static/plus.png							  \
-	html/_static/pygments.css						  \
-	html/_static/searchtools.js						  \
-	html/_static/sidebar.js							  \
-	html/_static/underscore.js						  \
-	html/characteristic.html						  \
-	html/command_version.html						  \
-	html/commands.html							  \
-	html/commands/cache_limit.html						  \
-	html/commands/check.html						  \
-	html/commands/clearlock.html						  \
-	html/commands/column_create.html					  \
-	html/commands/column_list.html						  \
-	html/commands/column_remove.html					  \
-	html/commands/define_selector.html					  \
-	html/commands/defrag.html						  \
-	html/commands/delete.html						  \
-	html/commands/dump.html							  \
-	html/commands/load.html							  \
-	html/commands/log_level.html						  \
-	html/commands/log_put.html						  \
-	html/commands/log_reopen.html						  \
-	html/commands/quit.html							  \
-	html/commands/select.html						  \
-	html/commands/shutdown.html						  \
-	html/commands/status.html						  \
-	html/commands/suggest.html						  \
-	html/commands/table_create.html						  \
-	html/commands/table_list.html						  \
-	html/commands/table_remove.html						  \
-	html/commands/view_add.html						  \
-	html/commands_not_implemented/add.html					  \
-	html/commands_not_implemented/get.html					  \
-	html/commands_not_implemented/set.html					  \
-	html/developer.html							  \
-	html/developer/com.html							  \
-	html/developer/document.html						  \
-	html/developer/query.html						  \
-	html/developer/test.html						  \
-	html/execfile.html							  \
-	html/expr.html								  \
-	html/functions.html							  \
-	html/functions/edit_distance.html					  \
-	html/functions/geo_distance.html					  \
-	html/functions/geo_in_circle.html					  \
-	html/functions/geo_in_rectangle.html					  \
-	html/functions/now.html							  \
-	html/functions/rand.html						  \
-	html/genindex.html							  \
-	html/grnslap.html							  \
-	html/grntest.html							  \
-	html/http.html								  \
-	html/index.html								  \
-	html/install.html							  \
-	html/limitations.html							  \
-	html/news.html								  \
-	html/objects.inv							  \
-	html/process.html							  \
-	html/pseudo_column.html							  \
-	html/reference.html							  \
-	html/search.html							  \
-	html/searchindex.js							  \
-	html/spec.html								  \
-	html/spec/search.html							  \
-	html/troubleshooting.html						  \
-	html/troubleshooting/different_results_with_the_same_keyword.html	  \
-	html/tutorial.html							  \
-	html/tutorial/tutorial01.html						  \
-	html/tutorial/tutorial02.html						  \
-	html/tutorial/tutorial03.html						  \
-	html/tutorial/tutorial04.html						  \
-	html/tutorial/tutorial05.html						  \
-	html/tutorial/tutorial06.html						  \
-	html/tutorial/tutorial07.html						  \
-	html/tutorial/tutorial08.html						  \
-	html/tutorial/tutorial09.html						  \
-	html/tutorial/tutorial10.html						  \
-	html/type.html
-
-$(html_files): html-build-stamp
-html-build-stamp:
-	$(MAKE) html
-endif

  Renamed: doc/source/__init__.py (+0 -0) 100%
===================================================================

  Renamed: doc/source/characteristic.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/command_version.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/cache_limit.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/check.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/clearlock.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/column_create.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/column_list.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/column_remove.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/define_selector.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/defrag.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/delete.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/dump.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/load.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/log_level.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/log_put.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/log_reopen.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/quit.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/select.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/shutdown.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/status.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/suggest.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/table_create.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/table_list.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/table_remove.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands/view_add.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands_not_implemented/add.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands_not_implemented/get.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/commands_not_implemented/set.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/conf.py (+3 -3) 98%
===================================================================
--- doc/ja/source/conf.py    2011-05-06 09:29:45 +0000 (f1e4f43)
+++ doc/source/conf.py    2011-05-07 06:22:43 +0000 (4662de7)
@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-SPHINX_VERSION_REQUIRED = "1.0.1"
+SPHINX_VERSION_REQUIRED = "1.0.8" # 1.1 is required.
 RST2PDF_VERSION_REQUIRED = "0.14.2"
 
 import re
@@ -73,8 +73,8 @@ copyright = u'2009-' + unicode(datetime.today().year) + ', Brazil, Inc'
 if os.environ.has_key('GROONGA_VERSION'):
   version_sh = 'GROONGA_VERSION=' + os.environ['GROONGA_VERSION']
 else:
-  os.system('../../../version-gen.sh')
-  version_sh = open(os.path.join(os.path.dirname(__file__), '../../../version.sh')).read()
+  os.system('../../version-gen.sh')
+  version_sh = open(os.path.join(os.path.dirname(__file__), '../../version.sh')).read()
 
 release_regex = re.compile(r'^GROONGA_VERSION=(?P<release>.*)$')
 # The full version, including alpha/beta/rc tags.

  Renamed: doc/source/developer.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/developer/com.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/developer/document.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/developer/query.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/developer/test.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-10.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-11.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-12.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-13.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-14.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-15.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-16.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-17.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-5.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-6.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-7.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-8.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial01-9.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial02-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial02-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial02-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial03-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial03-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial03-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-5.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-6.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial04-7.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-5.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial05-6.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-5.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-6.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial06-7.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial07-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial07-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial07-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial07-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial08-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-1.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-10.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-2.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-3.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-4.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-5.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-6.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-7.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-8.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/example/tutorial10-9.log (+0 -0) 100%
===================================================================

  Renamed: doc/source/execfile.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/expr.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/edit_distance.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/geo_distance.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/geo_in_circle.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/geo_in_rectangle.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/now.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/functions/rand.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/grnslap.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/grntest.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/http.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/index.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/install.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/limitations.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/news.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/process.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/pseudo_column.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/rdoc.py (+0 -0) 100%
===================================================================

  Renamed: doc/source/reference.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/spec.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/spec/search.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/textile.py (+0 -0) 100%
===================================================================

  Renamed: doc/source/troubleshooting.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/troubleshooting/different_results_with_the_same_keyword.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial01.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial02.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial03.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial04.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial05.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial06.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial07.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial08.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial09.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/tutorial/tutorial10.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/type.txt (+0 -0) 100%
===================================================================

  Renamed: doc/source/update_execution_example.py (+0 -0) 100%
===================================================================




Groonga-commit メーリングリストの案内
Back to archive index