diff --git a/doc/www-data/robots.txt b/doc/www-data.in/_extras/robots.txt
similarity index 100%
rename from doc/www-data/robots.txt
rename to doc/www-data.in/_extras/robots.txt
diff --git a/doc/www-data/bg_header.png b/doc/www-data/bg_header.png
deleted file mode 100644
index b6a32c8fd7d13dbf5e33c4750a7edc281dd92f95..0000000000000000000000000000000000000000
Binary files a/doc/www-data/bg_header.png and /dev/null differ
diff --git a/doc/www-data/global.css b/doc/www-data/global.css
deleted file mode 100644
index 10a880de1d7e9eff816cfec625cc89634986b18f..0000000000000000000000000000000000000000
--- a/doc/www-data/global.css
+++ /dev/null
@@ -1,108 +0,0 @@
-body {
- color: #333;
- font-family: Helvetica, Arial, sans-serif;
- font-size: 13px;
- line-height: 1;
- padding: 0;
- margin: 0;
-}
-
-#header {
- margin: 20px auto 10px auto;
- width: 960px;
- overflow: hidden;
-}
-
-#header #nav {
- width: 740px;
- float: right;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- background: url('bg_header.png') repeat-x scroll 50% 0 white;
-}
-
-#header #nav ul {
- list-style: none outside none;
- margin: 0 15px;
- padding: 0;
-}
-
-#header #nav ul li {
- float: left;
-}
-
-#header #nav ul li a {
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
- color: #eee;
- text-decoration: none;
- text-shadow: 0 1px 1px rgba(0,0,0,0.5);
- text-transform: uppercase;
- font-size: 11px;
- font-weight: bold;
- line-height: 32px;
- padding: 3px 12px;
- margin: 0 15px;
-}
-
-#header #nav ul li.current a {
- background-color: rgba(0,0,0,0.5) !important;
-}
-
-#header #nav ul li a:HOVER {
- background-color: rgba(0,0,0,0.25)
-}
-
-#header #logo {
- width: 150px;
- height: 30px;
- float: left;
- display: block;
- background: url(tarantool.png) no-repeat;
- margin: 3px 30px 0 30px;
-
-}
-
-#main {
- overflow: hidden;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
-
- -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.3);
- -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.3);
- box-shadow: 0 1px 3px rgba(0,0,0,0.3);
-
- width: 960px;
-
- margin: 0 auto;
-}
-
-.mBox { margin: 0 20px 10px 20px; display: inline; float: left; }
-.w600 { width: 600px; }
-.w280 { width: 280px; }
-#tarantool p {
- margin: 10px 0;
- line-height: 18px;
-}
-#main li {
- margin: 10px 0;
- line-height: 14px;
-}
-
-#tarantool h1 { margin: 10px 0; font-size: 28px; font-family: HelveticaNeue-Light,"Helvetica Neue Light",Helvetica,Arial,sans-serif; color: #000; font-weight: normal; }
-#tarantool h1 a { color: black; text-decoration: none; }
-
-#tarantool h2 { margin: 10px 0; font-size: 24px; font-family: HelveticaNeue-Light,"Helvetica Neue Light",Helvetica,Arial,sans-serif; color: #000; font-weight: normal; }
-#tarantool h2 a { color: black; text-decoration: none; }
-
-#tarantool h3 { margin: 10px 0; font-size: 20px; font-family: HelveticaNeue-Light,"Helvetica Neue Light",Helvetica,Arial,sans-serif; color: #000; font-weight: normal; }
-#tarantool h3 a { color: black; text-decoration: none; }
-
-#tarantool h4 { margin: 10px 0; font-size: 16px; font-family: HelveticaNeue-Light,"Helvetica Neue Light",Helvetica,Arial,sans-serif; color: #000; font-weight: normal; }
-#tarantool h4 a { color: black; text-decoration: none; }
-
-.mt20 { margin-top: 20px !important; }
-#tarantool a { color: #369;}
diff --git a/doc/www-data/index.html b/doc/www-data/index.html
deleted file mode 100644
index b072a087296dec9c5f2d305ec9e5455f48f6be6a..0000000000000000000000000000000000000000
--- a/doc/www-data/index.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Tarantool</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="global.css" />
-
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-22120502-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
-
-</head>
-
-<body id="tarantool">
-
- <div id="header">
- <a id="logo" href="index.html"></a>
- <div id="nav">
- <ul>
- <li class="current"><a href="index.html">Home</a></li>
- <li><a href="tarantool_user_guide.html">Documentation</a></li>
- <li><a href="http://bugs.launchpad.net/tarantool">Bugs</a></li>
- <li><a href="http://github.com/mailru/tarantool/wiki">Wiki</a></li>
- <li><a href="http://tarantool.org/dist/">Downloads</a></li>
- <li><a href="index.ru.html">РуÑÑкий</a></li>
- </ul>
- </div>
- </div>
- <div id="main">
- <div class="mBox w600">
- <div class="item">
- <p>
- Tarantool/Box, or simply Tarantool, is a high performance
- key/value storage server. The code is available for free under
- the terms of <em><a href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">BSD license</a></em>. Supported platforms are GNU/Linux and
- FreeBSD.
-
- </p><p>
- The server <span class="strong"><strong>maintains all its data in
- random-access memory</strong></span>, and therefore can handle read
- requests blazingly fast. At the same time, a copy of the data
- is kept on non-volatile storage (a disk drive), and inserts
- and updates are performed atomically.
- </p><p>
- To ensure atomicity, consistency and crash-safety of the
- persistent copy, a write-ahead
- log (WAL) is maintained, and each change is recorded
- in the WAL before it is considered complete.
- </p><p>
- If update and delete rate is high, a constantly growing
- write-ahead log file (or files) can pose a disk space problem,
- and significantly increase time necessary to restart from disk.
- A simple solution is employed: the server <span class="strong"><strong>can be requested to save a concise
- snapshot</strong></span> of
- its current data. The underlying operating system's
- <span class="quote">“<span class="quote">copy-on-write</span>”</span> feature is employed to take the
- snapshot in a quick, resource-savvy and non-blocking manner.
- The <span class="quote">“<span class="quote">copy-on-write</span>”</span> technique guarantees that
- snapshotting has minimal impact on server performance.
- </p><p>
- Tarantool supports replication. Replicas may run locally or
- on a remote host. Tarantool replication
- is asynchronous and does not block writes to the
- master. When or if the master becomes unavailable, the replica
- can be switched to assume the role of the master.
- </p><p>
- <span class="strong"><strong>Tarantool is lock-free</strong></span>.
- Instead of the underlying operating system's concurrency
- primitives, Tarantool uses cooperative multitasking environment
- to simultaneously operate on thousands of connections. While
- this approach limits server scalability to a single CPU core, in
- practice it removes competition for the memory bus and sets the
- scalability limit to the top of memory and network throughput.
- CPU utilization of a typical highly-loaded Tarantool server is
- under 10%.
- </p><p>
- <span class="strong"><strong>The software is production-ready</strong></span>.
- Tarantool has been developed and is actively used at
- <em><a href="http://api.mail.ru">Mail.Ru</a></em>
- one of the leading Russian web content providers. At Mail.Ru,
- the sowtware serves the <span class="quote">“<span class="quote">hottest</span>”</span>
- data, such as online users and their sessions, online application
- properties, the map between users and their serving shards.
- </p><p>
- To conclude, Tarantool/Box is ideal for highly volatile and/or
- highly accessed Web data. With Tarantool, performance overhead
- on serving data is minimal: a single server can easily deal with
- tens or even hundreds of thousands of requests per second.
- Snapshots can be made when Web user activity is at its lowest,
- for example at night, and thus add little or no restraint on the
- top throughput of the system. If the master becomes
- unavailable, a replica can assume the role of the master with
- minimal downtime.
-</p>
- </div>
- </div>
- <div class="mBox w280">
- <h3>IRC chatroom</h3>
- <b>#tarantool on <a href="http://webchat.freenode.net/">irc.freenode.net</a></b>
- </div>
- <div class="mBox w280">
- <br /><br />
- <h3>What's new</h3>
- <p>2011-10-07: <a href="http://tarantool.org/dist/tarantool-1.4.3-3-g45804c6-src.tar.gz">Tarantool 1.4.3</a>, stable version of 1.4 branch.</p>
- <p>2011-08-25: Tarantool 1.4.2, featuring Lua stored prcoedures, is out.</p>
- <p>2011-06-05: <a href="http://tarantool.org/tarantool_user_guide.html">Tarantool User Guide</a> is published.</p>
- <p>2011-05-14: <a href="http://launchpad.net/tarantool/1.3/1.3.5/+download/tarantool-1.3.5-src.tar.gz">tarantool-1.3.5</a> (stable) is out.</p>
- </div>
- </div>
-</body>
-</html>
diff --git a/doc/www-data/index.ru.html b/doc/www-data/index.ru.html
deleted file mode 100644
index b07bc6165749855952c8421ae09aae0686275efd..0000000000000000000000000000000000000000
--- a/doc/www-data/index.ru.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Tarantool</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="global.css" />
-
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-22120502-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
-
-</head>
-
-<body id="tarantool">
-
- <div id="header">
- <a id="logo" href="index.ru.html"></a>
- <div id="nav">
- <ul>
- <li class="current"><a href="index.ru.html">ГлавнаÑ</a></li>
- <li><a href="tarantool_user_guide.html">ДокументациÑ</a></li>
- <li><a href="http://github.com/mailru/tarantool/wiki/Home">Wiki</a></li>
- <li><a href="dist/">Скачать</a></li>
- <li><a href="index.html">English</a></li>
- </ul>
- </div>
- </div>
- <div id="main">
- <div class="mBox w600">
- <div class="item">
- <p><b>Tarantool</b> — однопоточный TCP Ñервер,
- реализующий кооперативную многозадачноÑÑ‚ÑŒ. РазрабатываетÑÑ
- Ñ ÑƒÑ‡ÐµÑ‚Ð¾Ð¼ работы под выÑокими нагрузками (деÑÑтки Ñ‚Ñ‹ÑÑч
- RPS). Можно выделить две логичеÑкие ÑоÑтавлÑющие: Ñдро и
- модули. Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ модулей производитÑÑ
- на Ñтапе компилÑции. Ðа уровне Ñдра реализуетÑÑ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ð¹
- функционал (общение по Ñети, работа Ñ Ð±Ð¸Ð½Ð°Ñ€Ð½Ñ‹Ð¼Ð¸ логами,
- Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¿Ð¾ Ñети, быÑтрое переключение на резервный
- Ñервер и Ñ‚.п.). Ð’ модулÑÑ… реализуетÑÑ Ð±Ð¸Ð·Ð½ÐµÑ Ð»Ð¾Ð³Ð¸ÐºÐ°
- конкретного Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ Ð¸Ñпользованием API Ñдра.</p>
-
- <p><b>Tarantool/Box</b> — хранилище данных в
- памÑти, ключ-значение.</p>
-
- <p>Сервер разрабатывалÑÑ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… целей в компании
- Mail.Ru. Ð’ процеÑÑе ÑкÑплуатации ÑиÑтема хорошо
- зарекомендовала ÑÐµÐ±Ñ Ð¸ была внедрена во многих проектах
- компании. Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ð²Ñ‹Ñокой производительноÑти и надежноÑти
- ÑиÑтемы в уÑловиÑÑ… больших нагрузок, удалоÑÑŒ повыÑить
- ÑтабильноÑÑ‚ÑŒ предоÑтавлÑемых ÑервиÑов. ÐŸÐµÑ€Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ
- Ñервера, Ñтавшего оÑновой Ð´Ð»Ñ Ñ†ÐµÐ»Ð¾Ð³Ð¾ ÑемейÑтва хранилищ,
- поÑвилаÑÑŒ в 2008 году. Tarantool – переработанный и
- уÑовершенÑтвованный Ñервер, предназначенный Ð´Ð»Ñ Ð¿Ð¾ÑтроениÑ
- Ñпециализированных хранилищ. Код напиÑан на Ñзыке С и
- иÑпользует раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ gcc.</p>
-
- <p><b>ХарактериÑтики</b>
- <ul>
- <li>отÑутÑтвие фрагментации оÑновной памÑти и деградации
- производительноÑти при работе Ñ Ð¼Ð½Ð¾Ð¶ÐµÑтвом маленьких
- объектов, Ð±Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ð¸cпользованию ÑобÑтвенных
- аллокаторов;</li>
- <li>возможноÑÑ‚ÑŒ работы Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼Ð¸ объемами данных;</li>
- <li>наличие файла snapshot, в котором ÑохранÑетÑÑ
- ÑоÑтоÑние вÑех данных базы на момент запиÑи на
- диÑк;</li>
- <li>ÑпоÑобноÑÑ‚ÑŒ ÑохранÑÑ‚ÑŒ вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑоÑтоÑÐ½Ð¸Ñ Ð±Ð°Ð·Ñ‹
- данных (логирование транзакций в файлах бинарных
- логов) и автоматичеÑки воÑÑтанавливать информацию
- поÑле перезапуÑка ÑиÑтемы;</li>
- <li>выÑÐ¾ÐºÐ°Ñ Ð´Ð¾ÑтупноÑÑ‚ÑŒ ÑиÑтемы (в Ñлучае программных или
- аппаратных Ñбоев проиÑходит автоматичеÑкое
- переключение на доÑтупную реплику);</li>
- <li>ÑовмеÑтимоÑÑ‚ÑŒ Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼ memcached;</li>
- <li>возможноÑÑ‚ÑŒ обновлÑÑ‚ÑŒ ÑиÑтему незаметно от клиентÑких
- ÑервиÑов Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… реплик;</li>
- <li>Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… по Ñети;</li>
- <li>проÑтой бинарный протокол Ð´Ð»Ñ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸
- дополнительной логики;</li>
- <li>СобираетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ под gcc;</li>
- <li>ТеÑтировалÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ под Linux.</li>
- </ul>
- </p>
- </div>
- </div>
- <div class="mBox w280">
- <h3>IRC chatroom</h3>
- <b>#tarantool on <a href="http://webchat.freenode.net/">irc.freenode.net</a></b>
- </div>
- <div class="mBox w280">
- <br /><br />
- <h3>ÐовоÑти</h3>
- <p>2011-10-07: <a href="http://tarantool.org/dist/tarantool-1.4.3-3-g45804c6-src.tar.gz">Tarantool 1.4.3</a>, ÑÑ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð²ÐµÑ‚ÐºÐ¸ 1.4.</p>
- <p>2011-08-25: Tarantool 1.4.2, Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ Lua.</p>
- <p>2011-06-05: Опубликован <a href="http://tarantool.org/tarantool_user_guide.html">tarantool user guide</a>.</p>
- <p>2011-05-14: <a href="http://launchpad.net/tarantool/1.3/1.3.5/+download/tarantool-1.3.5-src.tar.gz">tarantool-1.3.5</a>, ÑÑ‚Ð°Ð±Ð¸Ð»ÑŒÐ½Ð°Ñ Ð²ÐµÑ€ÑиÑ.</p>
- </div>
- </div>
-</body>
-</html>
diff --git a/doc/www-data/tarantool.png b/doc/www-data/tarantool.png
deleted file mode 100644
index 86dbf9dce9d4880fbe281f86e2f266675e08a685..0000000000000000000000000000000000000000
Binary files a/doc/www-data/tarantool.png and /dev/null differ
diff --git a/doc/www-data/tnt.css b/doc/www-data/tnt.css
deleted file mode 100644
index 28bf7088da3de85e408858bfb5956b048eccdfca..0000000000000000000000000000000000000000
--- a/doc/www-data/tnt.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.tntadmin {
- font-family: monospace;
- font-weight: bold;
- text-transform: uppercase;
- color: green;
-}
-
-.hl-keyword {
- color: green;
- font-weight: bold;
-}
-
-.hl-comment{
- color: blue;
- font-weight: bold;
-}
diff --git a/doc/www-data/yandex_5850d4f0ae375477.html b/doc/www-data/yandex_5850d4f0ae375477.html
deleted file mode 100644
index 059340dbf29c248bd88328594b809dc08ba68b89..0000000000000000000000000000000000000000
--- a/doc/www-data/yandex_5850d4f0ae375477.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- </head>
- <body>Verification: 5850d4f0ae375477</body>
-</html>