Merge branch 'doc-edit'

doc/www-data.in/_ignore

@@ -5,3 +5,4 @@ CMakeFiles
 cmake_install.cmake
 download.cmake
 Makefile
+.*.swp

doc/www-data.in/download.cmake

@@ -21,7 +21,6 @@ packages contain asserts and are compiled without optimization.
 To simplify problem analysis and avoid various bugs induced 
 by compilation parameters and environment, it is recommended
 that production systems use the builds provided on this site.
-
 The latest build can be found below.
 
 <table border=1 title="Download the latest build, @TARANTOOL_VERSION@" width=100%> 
@@ -142,8 +141,7 @@ The latest build can be found below.
 
 ### All downloads
 
-An archive of old releases can be found at <a
-href="http://tarantool.org/dist">here</a>.
+An archive of old releases can be found <a href="http://tarantool.org/dist">here</a>.
 
 ### Connectors
 

doc/www-data.in/faq

@@ -4,21 +4,21 @@
 
 **Q. Why Tarantool?**
 
-A. Tarantool is a result of long trial and error process within Mail.Ru. It's an nth generation of a family of custom in-memory data servers, developed for various web applications. Besides, when Tarantool development started (2008) there were no stable and sufficiently functional open source alternative.
+A. Tarantool is a result of a long trial and error process within Mail.Ru. It's the Nth generation of a family of custom in-memory data servers, developed for various web applications. Besides, when Tarantool development started (2008) there were no stable and sufficiently functional open source alternative.
 
 ** Q. Why Lua?**
 
-Lua is a ligthweight, fast, extensible multi-paradigm language. Lua also
+A. Lua is a ligthweight, fast, extensible multi-paradigm language. Lua also
 happens to be very easy to embed. Lua coroutines relate very closely to
 Tarantool fibers, and Lua architecture works well with Tarantool internals. 
-Lua is first, but, hopefully, not last stored program language for Tarantool.
+Lua is the first, but, hopefully, not the last stored program language for Tarantool.
 
 **Q. What's the key advantage of Tarantool?**
 
 A. Tarantool provides a fairly rich core feature set (HASH and TREE indexes, secondary indexes, composite indexes,
 asynchronous replication, hot standby, data durability) along with support for Lua stored procedures.
-These two properties allow to code fast, atomic and reliable in-memory data servers which handle non-trivial application-specific logic. The win over traditional SQL servers is in performance: low-overhead, lock-free architecture allows to serve
-an order of magnitude more RPS on comparable hardware. The win over NoSQL alternatives is in flexibility: Lua allows to flexibly process data stored in compact, not normalized format.
+These two properties make it possible to code fast, atomic and reliable in-memory data servers which handle non-trivial application-specific logic. The win over traditional SQL servers is in performance: low-overhead, lock-free architecture means Tarantool can serve
+an order of magnitude more requests per second, on comparable hardware. The win over NoSQL alternatives is in flexibility: Lua allows flexible processing of data stored in a compact, denormalized format.
 
 **Q. What are your development plans?**
 
@@ -30,7 +30,7 @@ A. There is a small engineering team employed by Mail.ru -- check out our commit
 
 **Q. How serious is Mail.Ru about Tarantool?**
 
-A. Tarantool is an open source project, distributed under BSD license, and as such does not depend on any one sponsor. However, it is currently and integral part of Mail.Ru backbone, and because of that, gets a lot of support from Mail.ru.
+A. Tarantool is an open source project, distributed under a BSD license, and as such does not depend on any one sponsor. However, it is currently and integral part of Mail.Ru backbone, so it gets a lot of support from Mail.ru.
 
 **Q. Why is Tarantool primary port number 33013?**
 
@@ -38,27 +38,27 @@ A. It's a prime number which is easy to remember, because 3313, 3301, 313, 13 an
 
 **Q. My arena_used/items_used in SHOW SLAB output is >> 1. What does it mean and what should I do?**
 
-A. A ratio of arena_used to items_used >> 1 indicates that there shore/fragmentation accumulated by the slab allocator. Imagine there are a lot of small tuples stored in the system initially, and later on each tuple becomes bigger and doesn't fit into its old slab size. The old slabs are never relinquished by the allocator. Currently this can be solved only by a server restart.
+A. If the ratio of arena_used to items_used >> 1, that indicates that there is fragmentation accumulated by the slab allocator. Imagine there are a lot of small tuples stored in the system initially, and later on each tuple becomes bigger and doesn't fit into its old slab size. The old slabs are never relinquished by the allocator. Currently this can be solved only by a server restart.
 
 {% page faq ru %}
 
 **Q. Why Tarantool?**
 
-A. Tarantool is a result of long trial and error process within Mail.Ru. It's an nth generation of a family of custom in-memory data servers, developed for various web applications. Besides, when Tarantool development started (2008) there were no stable and sufficiently functional open source alternative.
+A. Tarantool is a result of a long trial and error process within Mail.Ru. It's an Nth generation of a family of custom in-memory data servers, developed for various web applications. Besides, when Tarantool development started (2008) there were no stable and sufficiently functional open source alternative.
 
 ** Q. Why Lua?**
 
-Lua is a ligthweight, fast, extensible multi-paradigm language. Lua also
+A. Lua is a ligthweight, fast, extensible multi-paradigm language. Lua also
 happens to be very easy to embed. Lua coroutines relate very closely to
 Tarantool fibers, and Lua architecture works well with Tarantool internals. 
-Lua is first but not last stored program language for Tarantool.
+Lua is the first, but, hopefully, not the last stored program language for Tarantool.
 
 **Q. What's the key advantage of Tarantool?**
 
 A. Tarantool provides a fairly rich core feature set (HASH and TREE indexes, secondary indexes, composite indexes,
 asynchronous replication, hot standby, data durability) along with support for Lua stored procedures.
-These two properties allow to code fast, atomic and reliable in-memory data servers which handle non-trivial application-specific logic. The win over traditional SQL servers is in performance: low-overhead, lock-free architecture allows to serve
-an order of magnitude more RPS on comparable hardware. The win over NoSQL alternatives is in flexibility: Lua allows to flexibly process data stored in compact, not normalized format.
+These two properties make it possible to code fast, atomic and reliable in-memory data servers which handle non-trivial application-specific logic. The win over traditional SQL servers is in performance: low-overhead, lock-free architecture means Tarantool can serve
+an order of magnitude more requests per second, on comparable hardware. The win over NoSQL alternatives is in flexibility: Lua allows flexible processing of data stored in a compact, denormalized format.
 
 **Q. What are your development plans?**
 
@@ -70,7 +70,7 @@ A. There is a small engineering team employed by Mail.ru -- check out our commit
 
 **Q. How serious is Mail.Ru about Tarantool?**
 
-A. Tarantool is an open source project, distributed under BSD license, and as such does not depend on any one sponsor. However, it is currently and integral part of Mail.Ru backbone, and because of that, gets a lot of support from Mail.ru.
+A. Tarantool is an open source project, distributed under a BSD license, and as such does not depend on any one sponsor. However, it is currently and integral part of Mail.Ru backbone, so it gets a lot of support from Mail.ru.
 
 **Q. Why is Tarantool primary port number 33013?**
 
@@ -78,4 +78,4 @@ A. It's a prime number which is easy to remember, because 3313, 3301, 313, 13 an
 
 **Q. My arena_used/items_used in SHOW SLAB output is >> 1. What does it mean and what should I do?**
 
-A. A ratio of arena_used to items_used >> 1 indicates that there shore/fragmentation accumulated by the slab allocator. Imagine there are a lot of small tuples stored in the system initially, and later on each tuple becomes bigger and doesn't fit into its old slab size. The old slabs are never relinquished by the allocator. Currently this can be solved only by a server restart.
+A. If the ratio of arena_used to items_used >> 1, that indicates that there is fragmentation accumulated by the slab allocator. Imagine there are a lot of small tuples stored in the system initially, and later on each tuple becomes bigger and doesn't fit into its old slab size. The old slabs are never relinquished by the allocator. Currently this can be solved only by a server restart.

doc/www-data.in/index

@@ -47,7 +47,7 @@ Learn more
 =====================
 
 - [Introduction](intro.html)
-- [Frequently Aasked Questions](faq.html)
+- [Frequently Asked Questions](faq.html)
 - [A benchmark](benchmark.html)
 
 {% text home_page_learn ru %}

doc/www-data.in/intro

@@ -29,7 +29,7 @@ Tarantool supports replication. Replicas may run locally or on a remote host. Ta
 <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, since 2008. At Mail.Ru, the sowtware serves the <span class="quote">&#8220;<span class="quote">hottest</span>&#8221;</span> data, such as online users and their sessions, online application properties, the map between users and their serving shards.
+the leading Russian web content providers, since 2008. At Mail.Ru, the software serves the <span class="quote">&#8220;<span class="quote">hottest</span>&#8221;</span> data, such as online users and their sessions, online application properties, the map between users and their serving shards.
 
 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.