# HG changeset patch
# User Yaroslav Zhuravlev <yar@nginx.com>
# Date 1390475176 0
# Node ID e26a9f598e4065fb71b05fec477cfb9608c1b26a
# Parent  c5793e5c30d4b38f00653b68d621f6490e84aad5
Documented the "ssl_session_tickets" directive.

diff -r c5793e5c30d4 -r e26a9f598e40 xml/en/docs/http/ngx_http_ssl_module.xml
--- a/xml/en/docs/http/ngx_http_ssl_module.xml	Wed Jan 29 19:30:25 2014 +0400
+++ b/xml/en/docs/http/ngx_http_ssl_module.xml	Thu Jan 23 11:06:16 2014 +0000
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_ssl_module"
         link="/en/docs/http/ngx_http_ssl_module.html"
         lang="en"
-        rev="10">
+        rev="11">
 
 <section id="summary">
 
@@ -420,6 +420,21 @@
 </directive>
 
 
+<directive name="ssl_session_tickets">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>on</default>
+<context>http</context>
+<context>server</context>
+<appeared-in>1.5.9</appeared-in>
+
+<para>
+Enables or disables session resumption through
+<link url="http://tools.ietf.org/html/rfc5077">TLS session tickets</link>.
+</para>
+
+</directive>
+
+
 <directive name="ssl_session_timeout">
 <syntax><value>time</value></syntax>
 <default>5m</default>
diff -r c5793e5c30d4 -r e26a9f598e40 xml/ru/docs/http/ngx_http_ssl_module.xml
--- a/xml/ru/docs/http/ngx_http_ssl_module.xml	Wed Jan 29 19:30:25 2014 +0400
+++ b/xml/ru/docs/http/ngx_http_ssl_module.xml	Thu Jan 23 11:06:16 2014 +0000
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_ssl_module"
         link="/ru/docs/http/ngx_http_ssl_module.html"
         lang="ru"
-        rev="10">
+        rev="11">
 
 <section id="summary">
 
@@ -420,6 +420,21 @@
 </directive>
 
 
+<directive name="ssl_session_tickets">
+<syntax><literal>on</literal> | <literal>off</literal></syntax>
+<default>on</default>
+<context>http</context>
+<context>server</context>
+<appeared-in>1.5.9</appeared-in>
+
+<para>
+Разрешает или запрещает возобновление сессий при помощи
+<link url="http://tools.ietf.org/html/rfc5077">TLS session tickets</link>.
+</para>
+
+</directive>
+
+
 <directive name="ssl_session_timeout">
 <syntax><value>время</value></syntax>
 <default>5m</default>