cosmo0920
null+****@clear*****
Mon Dec 23 22:02:57 JST 2013
cosmo0920 2013-12-23 22:02:57 +0900 (Mon, 23 Dec 2013) New Revision: ab5b406a7edc650de88dad935a6ef949f994dcad https://github.com/groonga/groonga/commit/ab5b406a7edc650de88dad935a6ef949f994dcad Merged 9a14404: Merge pull request #132 from cosmo0920/use-Groonga-notation-network Message: doc: use "Groonga" notation groonga -> Groonga ^ gqtp -> GQTP ^^^^ Modified files: doc/locale/en/LC_MESSAGES/tutorial.po doc/locale/ja/LC_MESSAGES/tutorial.po doc/source/tutorial/network.txt Modified: doc/locale/en/LC_MESSAGES/tutorial.po (+43 -43) =================================================================== --- doc/locale/en/LC_MESSAGES/tutorial.po 2013-12-23 20:30:38 +0900 (3b60e18) +++ doc/locale/en/LC_MESSAGES/tutorial.po 2013-12-23 22:02:57 +0900 (bb5a6fd) @@ -2586,42 +2586,42 @@ msgstr "Remote access" # e8e707dcae6241878372a1fbe18994ec #: ../../../source/tutorial/network.txt:13 msgid "" -"You can use groonga as a server which allows remote access. Groonga supports " +"You can use Groonga as a server which allows remote access. Groonga supports " "the original protocol (gqtp), the memcached binary protocol and HTTP." msgstr "" -"You can use groonga as a server which allows remote access. Groonga supports " +"You can use Groonga as a server which allows remote access. Groonga supports " "the original protocol (gqtp), the memcached binary protocol and HTTP." # 4cd0dd5324cc4577b65762a8e9c3d185 #: ../../../source/tutorial/network.txt:16 -msgid "Groonga query transfer protocol (gqtp)" -msgstr "Groonga query transfer protocol (gqtp)" +msgid "Groonga query transfer protocol (GQTP)" +msgstr "Groonga query transfer protocol (GQTP)" # 9c22ad9858d24339bf756696db6cd27b #: ../../../source/tutorial/network.txt:19 -msgid "How to run a gqtp server" -msgstr "How to run a gqtp server" +msgid "How to run a GQTP server" +msgstr "How to run a GQTP server" # 6df4ee5a71104044bf27dbf253bdd36a #: ../../../source/tutorial/network.txt:21 msgid "" -"Groonga has a special protocol, named groonga query transfer ptorotocl " -"(gqtp), for remote access to a database. The following form shows how to run " -"groonga as a gqtp server." +"Groonga has a special protocol, named Groonga query transfer ptorotocl " +"(GQTP), for remote access to a database. The following form shows how to run " +"Groonga as a GQTP server." msgstr "" -"Groonga has a special protocol, named groonga query transfer ptorotocl " -"(gqtp), for remote access to a database. The following form shows how to run " -"groonga as a gqtp server." +"Groonga has a special protocol, named Groonga query transfer ptorotocl " +"(GQTP), for remote access to a database. The following form shows how to run " +"Groonga as a GQTP server." # 11fa4debd58640e8aef1c19cf271109e #: ../../../source/tutorial/network.txt:27 msgid "" -"The `-s` option specifies to run groonga as a server. DB_PATH specifies the " +"The `-s` option specifies to run Groonga as a server. DB_PATH specifies the " "path of the existing database to be hosted. The `-p` option and its " "argument, PORT_NUMBER, specify the port number of the server. The default " "port number is 10041, which is used when you don't specify PORT_NUMBER." msgstr "" -"The `-s` option specifies to run groonga as a server. DB_PATH specifies the " +"The `-s` option specifies to run Groonga as a server. DB_PATH specifies the " "path of the existing database to be hosted. The `-p` option and its " "argument, PORT_NUMBER, specify the port number of the server. The default " "port number is 10041, which is used when you don't specify PORT_NUMBER." @@ -2637,71 +2637,71 @@ msgstr "" # d1f95c64526a4d8591830f39b3a93f1f #: ../../../source/tutorial/network.txt:38 -msgid "How to run a gqtp daemon" -msgstr "How to run a gqtp daemon" +msgid "How to run a GQTP daemon" +msgstr "How to run a GQTP daemon" # b55dfa62608d4a9981497456460b291f #: ../../../source/tutorial/network.txt:40 msgid "" -"You can also run a gqtp server as a daemon by using the `-d` option, instead " +"You can also run a GQTP server as a daemon by using the `-d` option, instead " "of the `-s` option." msgstr "" -"You can also run a gqtp server as a daemon by using the `-d` option, instead " +"You can also run a GQTP server as a daemon by using the `-d` option, instead " "of the `-s` option." # f11b72db2ff7424185465776c5230b6c #: ../../../source/tutorial/network.txt:46 msgid "" -"A groonga daemon prints its process ID as follows. In this example, the " +"A Groonga daemon prints its process ID as follows. In this example, the " "process ID is 12345. Then, the daemon opens a specified database and accepts " "operations to that database." msgstr "" -"A groonga daemon prints its process ID as follows. In this example, the " +"A Groonga daemon prints its process ID as follows. In this example, the " "process ID is 12345. Then, the daemon opens a specified database and accepts " "operations to that database." # 13d82bf3e0dc438a867e53302c29cc8b #: ../../../source/tutorial/network.txt:55 -msgid "How to run a gqtp client" -msgstr "How to run a gqtp client" +msgid "How to run a GQTP client" +msgstr "How to run a GQTP client" # f63a03fbb82c41759bc463bd6c6e8324 #: ../../../source/tutorial/network.txt:57 -msgid "You can run groonga as a gqtp client as follows:" -msgstr "You can run groonga as a gqtp client as follows:" +msgid "You can run Groonga as a GQTP client as follows:" +msgstr "You can run Groonga as a GQTP client as follows:" # 7b0289e78ff449e889f7161f5e92e858 #: ../../../source/tutorial/network.txt:63 msgid "" -"This command establishes a connection with a gqtp server and then enters " +"This command establishes a connection with a GQTP server and then enters " "into interactive mode. HOST_NAME_OR_IP_ADDRESS specifies the hostname or the " -"IP address of the server. If not specified, groonga uses the default " +"IP address of the server. If not specified, Groonga uses the default " "hostname \"localhost\". The `-p` option and its argument, PORT_NUMBER, " -"specify the port number of the server. If not specified, groonga uses the " +"specify the port number of the server. If not specified, Groonga uses the " "default port number 10041." msgstr "" # 6e9832216e1049e281642be6ec5e292d #: ../../../source/tutorial/network.txt:72 msgid "" -"In interactive mode, groonga reads commands from the standard input and " +"In interactive mode, Groonga reads commands from the standard input and " "executes them one by one." msgstr "" -"In interactive mode, groonga reads commands from the standard input and " +"In interactive mode, Groonga reads commands from the standard input and " "executes them one by one." # 6a31d3c240b14ab69239a0d0ed2ace2f #: ../../../source/tutorial/network.txt:75 -msgid "How to terminate a gqtp server" -msgstr "How to terminate a gqtp server" +msgid "How to terminate a GQTP server" +msgstr "How to terminate a GQTP server" # a68da31135e14fa8ae4ad15d4a301986 #: ../../../source/tutorial/network.txt:77 msgid "" -"You can terminate a gqtp server with a :doc:`/reference/commands/shutdown` " +"You can terminate a GQTP server with a :doc:`/reference/commands/shutdown` " "command." msgstr "" -"You can terminate a gqtp server with a :doc:`/reference/commands/shutdown` " +"You can terminate a GQTP server with a :doc:`/reference/commands/shutdown` " "command." # be704078840241639953791bac8a9796 @@ -2713,10 +2713,10 @@ msgstr "Memcached binary protocol" #: ../../../source/tutorial/network.txt:88 msgid "" "Groonga supports the memcached binary protocol. The following form shows how " -"to run groonga as a memcached binary protocol server daemon." +"to run Groonga as a memcached binary protocol server daemon." msgstr "" "Groonga supports the memcached binary protocol. The following form shows how " -"to run groonga as a memcached binary protocol server daemon." +"to run Groonga as a memcached binary protocol server daemon." # f5c52799b90d457a8d01790760536beb #: ../../../source/tutorial/network.txt:94 @@ -2741,10 +2741,10 @@ msgstr "How to run an HTTP server" #: ../../../source/tutorial/network.txt:102 msgid "" "Groonga supports the hypertext transfer protocol (HTTP). The following form " -"shows how to run groonga as an HTTP server daemon." +"shows how to run Groonga as an HTTP server daemon." msgstr "" "Groonga supports the hypertext transfer protocol (HTTP). The following form " -"shows how to run groonga as an HTTP server daemon." +"shows how to run Groonga as an HTTP server daemon." # 847fcced5ca444739568e1a4af937921 #: ../../../source/tutorial/network.txt:108 @@ -2799,13 +2799,13 @@ msgstr "Administration tool (HTTP)" # 2f2ee28b4cb84b23919c441dc56c8b6b #: ../../../source/tutorial/network.txt:141 msgid "" -"An HTTP server of groonga provides a browser based administration tool that " +"An HTTP server of Groonga provides a browser based administration tool that " "makes database management easy. After starting an HTTP server, you can use " "the administration tool by accessing http://HOST_NAME_OR_IP_ADDRESS[:" "PORT_NUMBER]/. Note that Javascript must be enabled for the tool to work " "properly." msgstr "" -"An HTTP server of groonga provides a browser based administration tool that " +"An HTTP server of Groonga provides a browser based administration tool that " "makes database management easy. After starting an HTTP server, you can use " "the administration tool by accessing http://HOST_NAME_OR_IP_ADDRESS[:" "PORT_NUMBER]/. Note that Javascript must be enabled for the tool to work " @@ -2820,13 +2820,13 @@ msgstr "Security issues" #: ../../../source/tutorial/network.txt:146 msgid "" "Groonga servers don't support user authentication. Everyone can view and " -"modify databases hosted by groonga servers. You are recommended to restrict " -"IP addresses that can access groonga servers. You can use iptables or " +"modify databases hosted by Groonga servers. You are recommended to restrict " +"IP addresses that can access Groonga servers. You can use iptables or " "similar for this purpose." msgstr "" "Groonga servers don't support user authentication. Everyone can view and " -"modify databases hosted by groonga servers. You are recommended to restrict " -"IP addresses that can access groonga servers. You can use iptables or " +"modify databases hosted by Groonga servers. You are recommended to restrict " +"IP addresses that can access Groonga servers. You can use iptables or " "similar for this purpose." # 19c095bd11054dbb9197ac9deaf9b908 Modified: doc/locale/ja/LC_MESSAGES/tutorial.po (+22 -22) =================================================================== --- doc/locale/ja/LC_MESSAGES/tutorial.po 2013-12-23 20:30:38 +0900 (9f0a5a3) +++ doc/locale/ja/LC_MESSAGES/tutorial.po 2013-12-23 22:02:57 +0900 (c329f41) @@ -2363,10 +2363,10 @@ msgstr "リモートアクセス" # aba6954242c14501bd3a285d08a7f9b8 #: ../../../source/tutorial/network.txt:13 msgid "" -"You can use groonga as a server which allows remote access. Groonga supports " +"You can use Groonga as a server which allows remote access. Groonga supports " "the original protocol (GQTP), the memcached binary protocol and HTTP." msgstr "" -"groongaをサーバとして起動することにより、ネットワークを介してデータベースにア" +"Groongaをサーバとして起動することにより、ネットワークを介してデータベースにア" "クセスできるようになります。groongaがサポートしているプロトコルは、Groongaの" "専用プロトコルであるGQTP、memcachedバイナリプロトコル、HTTPの三種類です。" @@ -2384,21 +2384,21 @@ msgstr "GQTPサーバの起動" msgid "" "Groonga has a special protocol, named Groonga Query Transfer Protocol " "(GQTP), for remote access to a database. The following form shows how to run " -"groonga as a GQTP server." +"Groonga as a GQTP server." msgstr "" -"groongaには、専用のプロトコルであるgqtpが存在します。GQTPを用いることにより、" +"Groongaには、専用のプロトコルであるGQTPが存在します。GQTPを用いることにより、" "データベースへとリモートアクセスすることができます。以下の書式はGQTPサーバの" "起動方法を示しています。" # ec85c284500e4549b3ad9b977c5ca2aa #: ../../../source/tutorial/network.txt:27 msgid "" -"The `-s` option specifies to run groonga as a server. DB_PATH specifies the " +"The `-s` option specifies to run Groonga as a server. DB_PATH specifies the " "path of the existing database to be hosted. The `-p` option and its " "argument, PORT_NUMBER, specify the port number of the server. The default " "port number is 10041, which is used when you don't specify PORT_NUMBER." msgstr "" -"`-s` オプションはgroongaをサーバとして起動するためのオプションです。DB_PATHに" +"`-s` オプションはGroongaをサーバとして起動するためのオプションです。DB_PATHに" "は既存のデータベースのパスを指定します。 `-p` オプションとその引数により、" "サーバのポート番号を指定することができます。ポート番号を省略した場合は10041が" "使用されます。" @@ -2429,11 +2429,11 @@ msgstr "" # 3c5469f173484ec8ba39c2245ed9455a #: ../../../source/tutorial/network.txt:46 msgid "" -"A groonga daemon prints its process ID as follows. In this example, the " +"A Groonga daemon prints its process ID as follows. In this example, the " "process ID is 12345. Then, the daemon opens a specified database and accepts " "operations to that database." msgstr "" -"groongaをデーモンとして起動したときは、デーモンのプロセスIDが表示されます。以" +"Groongaをデーモンとして起動したときは、デーモンのプロセスIDが表示されます。以" "下の例では、12345というプロセスIDが表示されています。サーバとして起動した場合" "と同様に、指定されたデータベースへの操作を受け付けます。" @@ -2444,7 +2444,7 @@ msgstr "GQTPサーバへの接続" # f5ec19849c3d416b9704b474f9716929 #: ../../../source/tutorial/network.txt:57 -msgid "You can run groonga as a GQTP client as follows:" +msgid "You can run Groonga as a GQTP client as follows:" msgstr "GQTPサーバに接続するクライアントは、以下のように起動します。" # abf4e97bb050457ba3d7c2543db16c19 @@ -2452,9 +2452,9 @@ msgstr "GQTPサーバに接続するクライアントは、以下のように msgid "" "This command establishes a connection with a GQTP server and then enters " "into interactive mode. HOST_NAME_OR_IP_ADDRESS specifies the hostname or the " -"IP address of the server. If not specified, groonga uses the default " +"IP address of the server. If not specified, Groonga uses the default " "hostname \"localhost\". The `-p` option and its argument, PORT_NUMBER, " -"specify the port number of the server. If not specified, groonga uses the " +"specify the port number of the server. If not specified, Groonga uses the " "default port number 10041." msgstr "" "上記のコマンドによって起動されたクライアントは、サーバとの接続に成功すると対" @@ -2466,7 +2466,7 @@ msgstr "" #: ../../../source/tutorial/network.txt:72 msgid "" -"In interactive mode, groonga reads commands from the standard input and " +"In interactive mode, Groonga reads commands from the standard input and " "executes them one by one." msgstr "対話モードでは、標準入力からコマンドを読み込んで順次実行します。" @@ -2492,9 +2492,9 @@ msgstr "memcachedバイナリプロトコル" #: ../../../source/tutorial/network.txt:88 msgid "" "Groonga supports the memcached binary protocol. The following form shows how " -"to run groonga as a memcached binary protocol server daemon." +"to run Groonga as a memcached binary protocol server daemon." msgstr "" -"groongaはmemcachedバイナリプロトコルをサポートしています。以下の書式は" +"Groongaはmemcachedバイナリプロトコルをサポートしています。以下の書式は" "memcachedバイナリプロトコルのサーバをデーモンとして起動する方法を示していま" "す。" @@ -2520,9 +2520,9 @@ msgstr "HTTPサーバの起動" #: ../../../source/tutorial/network.txt:102 msgid "" "Groonga supports the hypertext transfer protocol (HTTP). The following form " -"shows how to run groonga as an HTTP server daemon." +"shows how to run Groonga as an HTTP server daemon." msgstr "" -"groongaはHTTPをサポートしています。以下の書式はHTTPサーバをデーモンとして起動" +"GroongaはHTTPをサポートしています。以下の書式はHTTPサーバをデーモンとして起動" "する方法を示しています。" # 3806418d724e4a11b0042ed5a51046c3 @@ -2564,7 +2564,7 @@ msgid "" "COMMAND_NAME. Command parameters can be passed as parameters of the GET " "request. The format is \"?NAME_1=VALUE_1&NAME_2=VALUE_2&...\"." msgstr "" -"groongaがHTTPサーバとして起動されているときは、/d/COMMAND_NAME というURLにア" +"GroongaがHTTPサーバとして起動されているときは、/d/COMMAND_NAME というURLにア" "クセスすることにより、コマンドを実行することができます。コマンドの引数は、" "HTTPのGETパラメータとして渡します。引数の書式は \"?" "NAME_1=VALUE_1&NAME_2=VALUE_2&...\" となります。" @@ -2581,13 +2581,13 @@ msgstr "ブラウザベースの管理ツール" # f27356d1aceb4888a30743f0dd1c0b44 #: ../../../source/tutorial/network.txt:141 msgid "" -"An HTTP server of groonga provides a browser based administration tool that " +"An HTTP server of Groonga provides a browser based administration tool that " "makes database management easy. After starting an HTTP server, you can use " "the administration tool by accessing http://HOST_NAME_OR_IP_ADDRESS[:" "PORT_NUMBER]/. Note that Javascript must be enabled for the tool to work " "properly." msgstr "" -"groongaをHTTPサーバとして起動しているときは、ブラウザベースの管理ツールを使う" +"GroongaをHTTPサーバとして起動しているときは、ブラウザベースの管理ツールを使う" "ことにより、データベースを簡単に管理することができます。管理ツールを使いたい" "ときは、ブラウザを使って http://HOST_NAME_OR_IP_ADDRESS[:PORT_NUMBER]/ へとア" "クセスしてください。管理ツールの使用には、JavaScriptの実行が有効になっている" @@ -2600,11 +2600,11 @@ msgstr "セキュリティ" #: ../../../source/tutorial/network.txt:146 msgid "" "Groonga servers don't support user authentication. Everyone can view and " -"modify databases hosted by groonga servers. You are recommended to restrict " -"IP addresses that can access groonga servers. You can use iptables or " +"modify databases hosted by Groonga servers. You are recommended to restrict " +"IP addresses that can access Groonga servers. You can use iptables or " "similar for this purpose." msgstr "" -"groongaのサーバには認証機能がありません。誰でもデータベースの内容を閲覧・修正" +"Groongaのサーバには認証機能がありません。誰でもデータベースの内容を閲覧・修正" "することができます。iptablesなどを用いてアクセス元IPアドレスを制限することを" "推奨します。" Modified: doc/source/tutorial/network.txt (+11 -11) =================================================================== --- doc/source/tutorial/network.txt 2013-12-23 20:30:38 +0900 (d5faa2e) +++ doc/source/tutorial/network.txt 2013-12-23 22:02:57 +0900 (3fdc66a) @@ -10,7 +10,7 @@ Remote access ============= -You can use groonga as a server which allows remote access. Groonga supports the original protocol (GQTP), the memcached binary protocol and HTTP. +You can use Groonga as a server which allows remote access. Groonga supports the original protocol (GQTP), the memcached binary protocol and HTTP. Groonga Query Transfer Protocol (GQTP) -------------------------------------- @@ -18,13 +18,13 @@ Groonga Query Transfer Protocol (GQTP) How to run a GQTP server ^^^^^^^^^^^^^^^^^^^^^^^^ -Groonga has a special protocol, named Groonga Query Transfer Protocol (GQTP), for remote access to a database. The following form shows how to run groonga as a GQTP server. +Groonga has a special protocol, named Groonga Query Transfer Protocol (GQTP), for remote access to a database. The following form shows how to run Groonga as a GQTP server. Form:: groonga [-p PORT_NUMBER] -s DB_PATH -The `-s` option specifies to run groonga as a server. DB_PATH specifies the path of the existing database to be hosted. The `-p` option and its argument, PORT_NUMBER, specify the port number of the server. The default port number is 10041, which is used when you don't specify PORT_NUMBER. +The `-s` option specifies to run Groonga as a server. DB_PATH specifies the path of the existing database to be hosted. The `-p` option and its argument, PORT_NUMBER, specify the port number of the server. The default port number is 10041, which is used when you don't specify PORT_NUMBER. The following command runs a server that listens on the default port number. The server accepts operations to the specified database. @@ -43,7 +43,7 @@ Form:: groonga [-p PORT_NUMBER] -d DB_PATH -A groonga daemon prints its process ID as follows. In this example, the process ID is 12345. Then, the daemon opens a specified database and accepts operations to that database. +A Groonga daemon prints its process ID as follows. In this example, the process ID is 12345. Then, the daemon opens a specified database and accepts operations to that database. Execution example:: @@ -54,13 +54,13 @@ Execution example:: How to run a GQTP client ^^^^^^^^^^^^^^^^^^^^^^^^ -You can run groonga as a GQTP client as follows: +You can run Groonga as a GQTP client as follows: Form:: groonga [-p PORT_NUMBER] -c [HOST_NAME_OR_IP_ADDRESS] -This command establishes a connection with a GQTP server and then enters into interactive mode. HOST_NAME_OR_IP_ADDRESS specifies the hostname or the IP address of the server. If not specified, groonga uses the default hostname "localhost". The `-p` option and its argument, PORT_NUMBER, specify the port number of the server. If not specified, groonga uses the default port number 10041. +This command establishes a connection with a GQTP server and then enters into interactive mode. HOST_NAME_OR_IP_ADDRESS specifies the hostname or the IP address of the server. If not specified, Groonga uses the default hostname "localhost". The `-p` option and its argument, PORT_NUMBER, specify the port number of the server. If not specified, Groonga uses the default port number 10041. .. groonga-command .. include:: ../example/tutorial/network-1.log @@ -69,7 +69,7 @@ This command establishes a connection with a GQTP server and then enters into in .. .. > ctrl-d .. .. % -In interactive mode, groonga reads commands from the standard input and executes them one by one. +In interactive mode, Groonga reads commands from the standard input and executes them one by one. How to terminate a GQTP server ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -85,7 +85,7 @@ You can terminate a GQTP server with a :doc:`/reference/commands/shutdown` comma Memcached binary protocol ------------------------- -Groonga supports the memcached binary protocol. The following form shows how to run groonga as a memcached binary protocol server daemon. +Groonga supports the memcached binary protocol. The following form shows how to run Groonga as a memcached binary protocol server daemon. Form:: @@ -99,7 +99,7 @@ Hypertext transfer protocol (HTTP) How to run an HTTP server ^^^^^^^^^^^^^^^^^^^^^^^^^ -Groonga supports the hypertext transfer protocol (HTTP). The following form shows how to run groonga as an HTTP server daemon. +Groonga supports the hypertext transfer protocol (HTTP). The following form shows how to run Groonga as an HTTP server daemon. Form:: @@ -138,9 +138,9 @@ The following example shows how to send commands to an HTTP server. Administration tool (HTTP) -------------------------- -An HTTP server of groonga provides a browser based administration tool that makes database management easy. After starting an HTTP server, you can use the administration tool by accessing http://HOST_NAME_OR_IP_ADDRESS[:PORT_NUMBER]/. Note that Javascript must be enabled for the tool to work properly. +An HTTP server of Groonga provides a browser based administration tool that makes database management easy. After starting an HTTP server, you can use the administration tool by accessing http://HOST_NAME_OR_IP_ADDRESS[:PORT_NUMBER]/. Note that Javascript must be enabled for the tool to work properly. Security issues --------------- -Groonga servers don't support user authentication. Everyone can view and modify databases hosted by groonga servers. You are recommended to restrict IP addresses that can access groonga servers. You can use iptables or similar for this purpose. +Groonga servers don't support user authentication. Everyone can view and modify databases hosted by Groonga servers. You are recommended to restrict IP addresses that can access Groonga servers. You can use iptables or similar for this purpose. -------------- next part -------------- HTML����������������������������...下载
