From 8381c0c3ec9ca86cc88db6ba4ece296a0eac418e Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 22 Jul 2016 02:45:38 +0300 Subject: [PATCH] Doc: added Xenial packages [#METR-20000]. --- doc/index.html | 19 +++++++++++-------- doc/reference_en.html | 9 +++------ doc/reference_ru.html | 9 +++------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/doc/index.html b/doc/index.html index 24cbc36b48f..f2b8c74d3df 100644 --- a/doc/index.html +++ b/doc/index.html @@ -394,7 +394,7 @@

System requirements: Linux, x86_64 with SSE 4.2.

Install packages for - Ubuntu 14.04 (Trusty) or Ubuntu 12.04 (Precise): + Ubuntu 16.04 (Xenial) or Ubuntu 14.04 (Trusty) or Ubuntu 12.04 (Precise):

@@ -481,16 +481,19 @@ clickhouse-client block_visible[class_name] ? hideBlock(class_name) : showBlock(class_name); } + var available_distributives = ['xenial', 'trusty', 'precise']; + function selectDistributive(name) { - var selected = name == 'precise' ? 'precise' : 'trusty'; - var other = name == 'precise' ? 'trusty' : 'precise'; - document.getElementById('ubuntu_' + selected).className = 'distributive_selected'; - document.getElementById('ubuntu_' + other).className = 'distributive_not_selected'; - document.getElementById('distributive').innerHTML = selected; + console.log(name); + document.getElementById('distributive').innerHTML = name; + available_distributives.forEach(function(distr) { + document.getElementById('ubuntu_' + distr).className = (name == distr) ? 'distributive_selected' : 'distributive_not_selected'; + }); } - document.getElementById('ubuntu_precise').addEventListener('click', function(e) { selectDistributive('precise'); }); - document.getElementById('ubuntu_trusty').addEventListener('click', function(e) { selectDistributive('trusty'); }); + available_distributives.forEach(function(distr) { + document.getElementById('ubuntu_' + distr).addEventListener('click', function(e) { selectDistributive(distr); }); + }); diff --git a/doc/reference_en.html b/doc/reference_en.html index ad878250267..0b29baa33f3 100644 --- a/doc/reference_en.html +++ b/doc/reference_en.html @@ -401,7 +401,7 @@ This is not a cross-platform system. It requires Linux Ubuntu Precise (12.04) or To test for SSE 4.2 support, do %%grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not supported"%% -We recommend using Ubuntu Trusty or Ubuntu Precise. +We recommend using Ubuntu Trusty or Ubuntu Xenial or Ubuntu Precise. The terminal must use UTF-8 encoding (the default in Ubuntu). @@ -420,11 +420,7 @@ On Ubuntu Trusty (14.04): deb http://repo.yandex.ru/clickhouse/trusty stable main %% -On Ubuntu Precise (12.04): - -%% -deb http://repo.yandex.ru/clickhouse/precise stable main -%% +For other Ubuntu versions, replace %%trusty%% to %%xenial%% or %%precise%%. Then run: @@ -436,6 +432,7 @@ sudo apt-get install clickhouse-client clickhouse-server-common You can also download and install packages manually from here: http://repo.yandex.ru/clickhouse/trusty/pool/main/c/clickhouse/, +http://repo.yandex.ru/clickhouse/xenial/pool/main/c/clickhouse/ http://repo.yandex.ru/clickhouse/precise/pool/main/c/clickhouse/. ClickHouse contains access restriction settings. They are located in the 'users.xml' file (next to 'config.xml'). diff --git a/doc/reference_ru.html b/doc/reference_ru.html index 17e7db822f2..f165db09cb2 100644 --- a/doc/reference_ru.html +++ b/doc/reference_ru.html @@ -408,7 +408,7 @@ YT позволяет хранить группы столбцов по отде Для проверки наличия SSE 4.2, выполните: %%grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not supported"%% -Рекомендуется использовать Ubuntu Trusty или Ubuntu Precise. +Рекомендуется использовать Ubuntu Trusty или Ubuntu Xenial или Ubuntu Precise. Терминал должен работать в кодировке UTF-8 (как по умолчанию в Ubuntu). @@ -427,11 +427,7 @@ YT позволяет хранить группы столбцов по отде deb http://repo.yandex.ru/clickhouse/trusty stable main %% -На Ubuntu Precise (12.04): - -%% -deb http://repo.yandex.ru/clickhouse/precise stable main -%% +На других версиях Ubuntu, замените %%trusty%% на %%xenial%% или %%precise%%. Затем выполните: @@ -444,6 +440,7 @@ sudo apt-get install clickhouse-client clickhouse-server-common Также можно скачать и установить пакеты вручную, отсюда: http://repo.yandex.ru/clickhouse/trusty/pool/main/c/clickhouse/, +http://repo.yandex.ru/clickhouse/xenial/pool/main/c/clickhouse/, http://repo.yandex.ru/clickhouse/precise/pool/main/c/clickhouse/. ClickHouse содержит настройки ограничения доступа. Они расположены в файле users.xml (рядом с config.xml).