Merge pull request #6100 from vivienm/master

Fix typos in docs
This commit is contained in:
Ivan Blinkov 2019-07-22 16:34:50 +03:00 committed by GitHub
commit 97b2a290ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View File

@ -322,8 +322,8 @@ Writing to the syslog is also supported. Config example:
Keys: Keys:
- user_syslog — Required setting if you want to write to the syslog. - use_syslog — Required setting if you want to write to the syslog.
- address — The host[:порт] of syslogd. If omitted, the local daemon is used. - address — The host[:port] of syslogd. If omitted, the local daemon is used.
- hostname — Optional. The name of the host that logs are sent from. - hostname — Optional. The name of the host that logs are sent from.
- facility — [The syslog facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility) in uppercase letters with the "LOG_" prefix: (``LOG_USER``, ``LOG_DAEMON``, ``LOG_LOCAL3``, and so on). - facility — [The syslog facility keyword](https://en.wikipedia.org/wiki/Syslog#Facility) in uppercase letters with the "LOG_" prefix: (``LOG_USER``, ``LOG_DAEMON``, ``LOG_LOCAL3``, and so on).
Default value: ``LOG_USER`` if ``address`` is specified, ``LOG_DAEMON otherwise.`` Default value: ``LOG_USER`` if ``address`` is specified, ``LOG_DAEMON otherwise.``

View File

@ -1,6 +1,6 @@
# MergeTree {#table_engines-mergetree} # MergeTree {#table_engines-mergetree}
The `MergeTree` engine and other engines of this family (`*MergeTree`) are the most robust ClickHousе table engines. The `MergeTree` engine and other engines of this family (`*MergeTree`) are the most robust ClickHouse table engines.
The basic idea for `MergeTree` engines family is the following. When you have tremendous amount of a data that should be inserted into the table, you should write them quickly part by part and then merge parts by some rules in background. This method is much more efficient than constantly rewriting data in the storage at the insert. The basic idea for `MergeTree` engines family is the following. When you have tremendous amount of a data that should be inserted into the table, you should write them quickly part by part and then merge parts by some rules in background. This method is much more efficient than constantly rewriting data in the storage at the insert.

View File

@ -694,7 +694,7 @@ The query `SELECT sum(x), y FROM t_null_big GROUP BY y` results in:
└────────┴──────┘ └────────┴──────┘
``` ```
You can see that `GROUP BY` for `У = NULL` summed up `x`, as if `NULL` is this value. You can see that `GROUP BY` for `y = NULL` summed up `x`, as if `NULL` is this value.
If you pass several keys to `GROUP BY`, the result will give you all the combinations of the selection, as if `NULL` were a specific value. If you pass several keys to `GROUP BY`, the result will give you all the combinations of the selection, as if `NULL` were a specific value.

View File

@ -319,7 +319,7 @@ ClickHouse проверит условия `min_part_size` и `min_part_size_rat
``` ```
Ключи: Ключи:
- user_syslog - обязательная настройка, если требуется запись в syslog - use_syslog - обязательная настройка, если требуется запись в syslog
- address - хост[:порт] демона syslogd. Если не указан, используется локальный - address - хост[:порт] демона syslogd. Если не указан, используется локальный
- hostname - опционально, имя хоста, с которого отсылаются логи - hostname - опционально, имя хоста, с которого отсылаются логи
- facility - [категория syslog](https://en.wikipedia.org/wiki/Syslog#Facility), - facility - [категория syslog](https://en.wikipedia.org/wiki/Syslog#Facility),