Merge branch 'master' of github.com:mroonga/mroonga

.gitignore

@@ -45,3 +45,4 @@ cscope.out
 /doc/ja/doctrees/
 /doc/ja/html/
 /misc/
+/tmp-doc/

Makefile.am

@@ -77,6 +77,10 @@ update-document:
 	  mv tmp-doc/dist/$${locale} $${dest_dir};		\
 	done
 
+update-files:
+	cd $(srcdir)/doc && $(MAKE) update-files
+	cd $(srcdir)/test/sql && $(MAKE) update-files
+
 echo-mysql-source:
 	echo $(MYSQL_SOURCE)
 

build/makefiles/sphinx.am

@@ -25,7 +25,7 @@ required_build_stamps =				\
 EXTRA_DIST += $(required_build_stamps)
 
 man_files =					\
-	man/groonga.1
+	man/groongastorageengine.1
 
 generated_files =				\
 	$(DOCTREES_BASE)			\

doc/Makefile.am

@@ -35,7 +35,7 @@ EXTRA_DIST =					\
 $(source_files_relative_from_doc_dir): html
 
 update-images:
-	cd $(srcdir)/source/_static/images && \
+	cd $(srcdir)/source/images && \
 	  make -f $(abs_srcdir)/images.mk update-images
 
 if ENABLE_DOCUMENT

doc/files.am

@@ -4,13 +4,16 @@ absolute_source_files = \
 	$(top_srcdir)/doc/source/developer.rst \
 	$(top_srcdir)/doc/source/developer/debug.rst \
 	$(top_srcdir)/doc/source/developer/release.rst \
+	$(top_srcdir)/doc/source/images/mroonga.png \
+	$(top_srcdir)/doc/source/images/mroonga.svg \
 	$(top_srcdir)/doc/source/images/storage-mode.png \
 	$(top_srcdir)/doc/source/images/storage-mode.svg \
 	$(top_srcdir)/doc/source/images/wrapper-mode.png \
 	$(top_srcdir)/doc/source/images/wrapper-mode.svg \
 	$(top_srcdir)/doc/source/index.rst \
 	$(top_srcdir)/doc/source/install.rst \
 	$(top_srcdir)/doc/source/news.rst \
+	$(top_srcdir)/doc/source/news/0.x.rst \
 	$(top_srcdir)/doc/source/reference.rst \
 	$(top_srcdir)/doc/source/userguide.rst \
 	$(top_srcdir)/doc/source/userguide/storage.rst \
@@ -20,12 +23,14 @@ absolute_source_files = \
 absolute_theme_files = \
 	$(top_srcdir)/doc/themes/mroonga/layout.html \
 	$(top_srcdir)/doc/themes/mroonga/static/favicon.ico \
+	$(top_srcdir)/doc/themes/mroonga/static/favicon.svg \
 	$(top_srcdir)/doc/themes/mroonga/static/footer-bar.png \
-	$(top_srcdir)/doc/themes/mroonga/static/mroonga.css_t \
 	$(top_srcdir)/doc/themes/mroonga/static/header-background.png \
 	$(top_srcdir)/doc/themes/mroonga/static/jp.png \
 	$(top_srcdir)/doc/themes/mroonga/static/logo.png \
+	$(top_srcdir)/doc/themes/mroonga/static/logo.svg \
 	$(top_srcdir)/doc/themes/mroonga/static/menu-header.png \
+	$(top_srcdir)/doc/themes/mroonga/static/mroonga.css_t \
 	$(top_srcdir)/doc/themes/mroonga/static/navigation-bar.png \
 	$(top_srcdir)/doc/themes/mroonga/static/us.png \
 	$(top_srcdir)/doc/themes/mroonga/theme.conf \
@@ -37,13 +42,16 @@ source_files_relative_from_doc_dir = \
 	source/developer.rst \
 	source/developer/debug.rst \
 	source/developer/release.rst \
+	source/images/mroonga.png \
+	source/images/mroonga.svg \
 	source/images/storage-mode.png \
 	source/images/storage-mode.svg \
 	source/images/wrapper-mode.png \
 	source/images/wrapper-mode.svg \
 	source/index.rst \
 	source/install.rst \
 	source/news.rst \
+	source/news/0.x.rst \
 	source/reference.rst \
 	source/userguide.rst \
 	source/userguide/storage.rst \
@@ -53,12 +61,14 @@ source_files_relative_from_doc_dir = \
 theme_files_relative_from_doc_dir = \
 	themes/mroonga/layout.html \
 	themes/mroonga/static/favicon.ico \
+	themes/mroonga/static/favicon.svg \
 	themes/mroonga/static/footer-bar.png \
-	themes/mroonga/static/mroonga.css_t \
 	themes/mroonga/static/header-background.png \
 	themes/mroonga/static/jp.png \
 	themes/mroonga/static/logo.png \
+	themes/mroonga/static/logo.svg \
 	themes/mroonga/static/menu-header.png \
+	themes/mroonga/static/mroonga.css_t \
 	themes/mroonga/static/navigation-bar.png \
 	themes/mroonga/static/us.png \
 	themes/mroonga/theme.conf \
@@ -119,6 +129,7 @@ html_files_relative_from_locale_dir = \
 	html/_sources/index.txt \
 	html/_sources/install.txt \
 	html/_sources/news.txt \
+	html/_sources/news/0.x.txt \
 	html/_sources/reference.txt \
 	html/_sources/userguide.txt \
 	html/_sources/userguide/storage.txt \
@@ -132,16 +143,27 @@ html_files_relative_from_locale_dir = \
 	html/_static/doctools.js \
 	html/_static/down-pressed.png \
 	html/_static/down.png \
+	html/_static/favicon.ico \
+	html/_static/favicon.svg \
 	html/_static/file.png \
+	html/_static/footer-bar.png \
+	html/_static/header-background.png \
+	html/_static/jp.png \
 	html/_static/jquery.js \
+	html/_static/logo.png \
+	html/_static/logo.svg \
+	html/_static/menu-header.png \
 	html/_static/minus.png \
+	html/_static/mroonga.css \
+	html/_static/navigation-bar.png \
 	html/_static/plus.png \
 	html/_static/pygments.css \
 	html/_static/searchtools.js \
 	html/_static/sidebar.js \
 	html/_static/underscore.js \
 	html/_static/up-pressed.png \
 	html/_static/up.png \
+	html/_static/us.png \
 	html/_static/websupport.js \
 	html/characteristic.html \
 	html/developer.html \
@@ -151,6 +173,7 @@ html_files_relative_from_locale_dir = \
 	html/index.html \
 	html/install.html \
 	html/news.html \
+	html/news/0.x.html \
 	html/objects.inv \
 	html/reference.html \
 	html/search.html \

doc/images.mk

@@ -0,0 +1,10 @@
+generated_images =		\
+	mroonga.png		\
+	storage-mode.png	\
+	wrapper-mode.png
+
+.SUFFIXES: .svg .png
+.svg.png:
+	inkscape --export-dpi 90 --export-background white --export-png $@ $<
+
+update-images: $(generated_images)

doc/locale/en/LC_MESSAGES/characteristic.po

@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: groonga storage engine 1.0.1\n"
+"Project-Id-Version: groonga storage engine 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-29 21:57\n"
-"PO-Revision-Date: 2011-10-29 21:56+0900\n"
+"POT-Creation-Date: 2011-11-03 17:56\n"
+"PO-Revision-Date: 2011-11-03 17:56+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # 12e8a8bcb388498497ae564098bebb1a

doc/locale/en/LC_MESSAGES/conf.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: groonga-storage-engine 1.0.1\n"
+"Project-Id-Version: groonga-storage-engine 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-29 21:56+0900\n"
-"PO-Revision-Date: 2011-10-29 21:56+0900\n"
+"POT-Creation-Date: 2011-11-03 17:56+0900\n"
+"PO-Revision-Date: 2011-11-03 17:57+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
 "Language: en\n"

doc/locale/en/LC_MESSAGES/developer.po

@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: groonga storage engine 1.0.1\n"
+"Project-Id-Version: groonga storage engine 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-29 21:57\n"
-"PO-Revision-Date: 2011-10-29 21:56+0900\n"
+"POT-Creation-Date: 2011-11-03 17:56\n"
+"PO-Revision-Date: 2011-11-03 17:57+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # c29fb6dfdbc1432d82257a679a472102
@@ -275,13 +275,13 @@ msgstr "groonga 1.2"
 
 # 9da18b1d73c84bbb99460c609b710fca
 #: ../../../source/developer.rst:95
-msgid "cutter 1.1 (for C/C++ unit tests)"
-msgstr "cutter 1.1 (for C/C++ unit tests)"
+msgid "Cutter 1.1 (for C/C++ unit tests)"
+msgstr "Cutter 1.1 (for C/C++ unit tests)"
 
 # 74a1926cacc441ff9e1232acae3ac96d
 #: ../../../source/developer.rst:96
-msgid "sphinx 1.0 (for documents)"
-msgstr "sphinx 1.0 (for documents)"
+msgid "Sphinx 1.1 (for documents)"
+msgstr "Sphinx 1.1 (for documents)"
 
 # cbb740915fcd40c492452ed27e06e8b9
 #: ../../../source/developer.rst:98
@@ -352,13 +352,13 @@ msgstr "The directory for per-function unit tests by C/C++"
 
 # 02b43f553a5f41a18241c9974c860c20
 #: ../../../source/developer.rst:130
-msgid "English documents in sphinx format"
-msgstr "English documents in sphinx format"
+msgid "English documents in Sphinx format"
+msgstr "English documents in Sphinx format"
 
 # 3055743b7410494ab08fc3bf6e64f9a2
 #: ../../../source/developer.rst:133
-msgid "Japanese documents in sphinx format"
-msgstr "Japanese documents in sphinx format"
+msgid "Japanese documents in Sphinx format"
+msgstr "Japanese documents in Sphinx format"
 
 # 80c0700dc13740f69be83439c14e5e21
 #: ../../../source/developer.rst:135
@@ -410,11 +410,11 @@ msgstr ""
 # a0d7c217eb0145a19f40366b72443fe1
 #: ../../../source/developer.rst:148
 msgid ""
-"They are function level regression tests using cutter. When you add features "
+"They are function level regression tests using Cutter. When you add features "
 "that cannot differ SQL queries' results, like utility functions, please add "
 "tests here."
 msgstr ""
-"They are function level regression tests using cutter. When you add features "
+"They are function level regression tests using Cutter. When you add features "
 "that cannot differ SQL queries' results, like utility functions, please add "
 "tests here."
 
@@ -469,8 +469,8 @@ msgstr "Adding and updating documents"
 
 # 22c1912012414df19594e8f9260af53e
 #: ../../../source/developer.rst:165
-msgid "We use sphinx for the documentation of groonga storage engine."
-msgstr "We use sphinx for the documentation of groonga storage engine."
+msgid "We use Sphinx for the documentation of groonga storage engine."
+msgstr "We use Sphinx for the documentation of groonga storage engine."
 
 # cf096f3dbdb04a6a8cb8a7d5152c9efc
 #: ../../../source/developer.rst:167

doc/locale/en/LC_MESSAGES/index.po

@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: groonga storage engine 1.0.1\n"
+"Project-Id-Version: groonga storage engine 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-29 21:57\n"
-"PO-Revision-Date: 2011-10-29 21:56+0900\n"
+"POT-Creation-Date: 2011-11-03 17:56\n"
+"PO-Revision-Date: 2011-11-03 17:57+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # e94489e2d4614d238692455923f1743f
@@ -29,8 +29,8 @@ msgstr "For the release history: :doc:`news`"
 
 # aa69a49827d4431c906268421a533eb4
 #: ../../../source/index.rst:22
-msgid "Indices and tables"
-msgstr "Indices and tables"
+msgid "Indices"
+msgstr "Indices"
 
 # fb0515ba1f61445ba7e88c4783e0b228
 #: ../../../source/index.rst:24

doc/locale/en/LC_MESSAGES/install.po

@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: groonga storage engine 1.0.1\n"
+"Project-Id-Version: groonga storage engine 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-29 21:57\n"
-"PO-Revision-Date: 2011-10-29 21:56+0900\n"
+"POT-Creation-Date: 2011-11-03 17:56\n"
+"PO-Revision-Date: 2011-11-03 17:57+0900\n"
 "Last-Translator: Kouhei Sutou <kou@clear-code.com>\n"
 "Language-Team: English\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # eaebd8de0033484f9ccce5c16d4e0ae3