Merge branch 'develop'

[govpn.git] / doc / govpn.texi

diff --git a/doc/govpn.texi b/doc/govpn.texi
index c31b59e2006160fbedf043e63c8d32ca226bd8b2..73e69084f21512616a984fc582c7b60124bc78ca 100644 (file)
--- a/doc/govpn.texi
+++ b/doc/govpn.texi
@@ -8,7 +8,7 @@ This manual is for GoVPN -- simple free software virtual private network
 daemon, aimed to be reviewable, secure, DPI/censorship-resistant,
 written on Go.
 
-Copyright @copyright{} 2014-2015 @email{stargrave@@stargrave.org, Sergey Matveev}
+Copyright @copyright{} 2014-2016 @email{stargrave@@stargrave.org, Sergey Matveev}
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -24,8 +24,12 @@ A copy of the license is included in the section entitled "Copying conditions".
 
 @include about.texi
 
+@center @strong{@ref{Tarballs, Download it}}.
+
 @menu
-* Подробнее о демоне: About RU.
+* About (russian): О демоне.
+* Frequently Asked Questions: FAQ.
+* Часто задаваемые вопросы: ЧАВО.
 * News::
 * Installation::
 * Precautions::
@@ -36,9 +40,12 @@ A copy of the license is included in the section entitled "Copying conditions".
 * In the media: Media.
 * TODO::
 * Copying conditions::
+* Concept index::
 @end menu
 
 @include about.ru.texi
+@include faq.texi
+@include faq.ru.texi
 @include news.texi
 @include installation.texi
 @include precautions.texi
@@ -54,4 +61,10 @@ A copy of the license is included in the section entitled "Copying conditions".
 
 @insertcopying
 @verbatiminclude fdl.txt
+
+@node Concept index
+@unnumbered Concept index
+
+@printindex cp
+
 @bye