Navigation Menu

Skip to content

Commit

Permalink
Merge pull request #173 from naoa/fix-gqtp-port-number
Browse files Browse the repository at this point in the history
doc:fix GQTP default port number

Patch by Naoya Murakami. Thanks!!!
  • Loading branch information
kou committed Jun 5, 2014
2 parents b0c5587 + 80b3299 commit 5cb3c7a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
14 changes: 8 additions & 6 deletions doc/locale/en/LC_MESSAGES/tutorial.po
Expand Up @@ -1932,12 +1932,12 @@ msgid ""
"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."
"port number is 10043, 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 "
"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."
"port number is 10043, which is used when you don't specify PORT_NUMBER."

msgid ""
"The following command runs a server that listens on the default port number. "
Expand Down Expand Up @@ -1977,14 +1977,14 @@ msgid ""
"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."
"default port number 10043."
msgstr ""
"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."
"default port number 10043."

msgid ""
"In interactive mode, Groonga reads commands from the standard input and "
Expand Down Expand Up @@ -2035,10 +2035,12 @@ msgstr ""

msgid ""
"The `--protocol` option and its argument specify the protocol of the server. "
"\"http\" specifies to use HTTP."
"\"http\" specifies to use HTTP. If the `-p` option not specified, Groonga "
"uses the default port number 10041."
msgstr ""
"The `--protocol` option and its argument specify the protocol of the server. "
"\"http\" specifies to use HTTP."
"\"http\" specifies to use HTTP. If the `-p` option not specified, Groonga "
"uses the default port number 10041."

msgid ""
"The following command runs an HTTP server that listens on the port number 80."
Expand Down
12 changes: 7 additions & 5 deletions doc/locale/ja/LC_MESSAGES/tutorial.po
Expand Up @@ -1779,11 +1779,11 @@ msgid ""
"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."
"port number is 10043, which is used when you don't specify PORT_NUMBER."
msgstr ""
"`-s` オプションはGroongaをサーバとして起動するためのオプションです。DB_PATHに"
"は既存のデータベースのパスを指定します。 `-p` オプションとその引数により、"
"サーバのポート番号を指定することができます。ポート番号を省略した場合は10041が"
"サーバのポート番号を指定することができます。ポート番号を省略した場合は10043が"
"使用されます。"

msgid ""
Expand Down Expand Up @@ -1824,13 +1824,13 @@ msgid ""
"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."
"default port number 10043."
msgstr ""
"上記のコマンドによって起動されたクライアントは、サーバとの接続に成功すると対"
"話モードに入ります。HOST_NAME_OR_IP_ADDRESSにはサーバのホスト名もしくはIPアド"
"レスを指定します。HOST_NAME_OR_IP_ADDRESSが省略されたときは\"localhost\"を"
"サーバのホスト名として採用します。また、 `-p` オプションとその引数により、"
"サーバのポート番号を指定することができます。ポート番号を省略した場合は10041が"
"サーバのポート番号を指定することができます。ポート番号を省略した場合は10043が"
"使用されます。"

msgid ""
Expand Down Expand Up @@ -1881,10 +1881,12 @@ msgstr ""

msgid ""
"The `--protocol` option and its argument specify the protocol of the server. "
"\"http\" specifies to use HTTP."
"\"http\" specifies to use HTTP. If the `-p` option not specified, Groonga "
"uses the default port number 10041."
msgstr ""
"`--protocol` オプションとその引数により、サーバのプロトコルを指定することがで"
"きます。\"http\"はHTTPサーバの起動を指示しています。"
"`-p` オプションを省略した場合は10041のポート番号が使用されます。"

msgid ""
"The following command runs an HTTP server that listens on the port number 80."
Expand Down
4 changes: 2 additions & 2 deletions doc/source/reference/executables/groonga.rst
Expand Up @@ -64,7 +64,7 @@ Groongaのデータベースは、groongaコマンドかCライブラリイン
.. cmdoption:: -p, --port <port number>

クライアント、サーバ、またはデーモンモードで使用するTCPポート番号。
(デフォルトは10041番)
(クライアントモードのデフォルトは10043番、サーバ、またはデーモンモードのデフォルトは、HTTPの場合、10041番、GQTPの場合、10043番)

.. cmdoption:: -i, --server-id <ip/hostname>

Expand Down Expand Up @@ -132,7 +132,7 @@ Groongaのデータベースは、groongaコマンドかCライブラリイン

使用するデータベースのパス名を指定します。

クライアントモードの場合は接続先のホスト名とポート番号を指定します(デフォルト値は'localhost:10041')。ポート番号を指定しない場合には、10041が指定されたものとします
クライアントモードの場合は接続先のホスト名とポート番号を指定します(デフォルト値は'localhost:10043')。ポート番号を指定しない場合には、10043が指定されたものとします

.. cmdoption:: command [args]

Expand Down
6 changes: 3 additions & 3 deletions doc/source/tutorial/network.rst
Expand Up @@ -24,7 +24,7 @@ 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 10043, 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.

Expand Down Expand Up @@ -60,7 +60,7 @@ 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 10043.

.. groonga-command
.. include:: ../example/tutorial/network-1.log
Expand Down Expand Up @@ -105,7 +105,7 @@ Form::

groonga [-p PORT_NUMBER] -d --protocol http DB_PATH

The `--protocol` option and its argument specify the protocol of the server. "http" specifies to use HTTP.
The `--protocol` option and its argument specify the protocol of the server. "http" specifies to use HTTP. If the `-p` option not specified, Groonga uses the default port number 10041.

The following command runs an HTTP server that listens on the port number 80.

Expand Down

0 comments on commit 5cb3c7a

Please sign in to comment.