Add SNI to the glossary

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830307 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 698e86b6b002dd8513c8115dbae19eb39320b354..8e39c2ea5ee2112d33a062c3b0d89d253443e726 100644 (file)
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -381,6 +381,17 @@
       See: <a href="ssl/">SSL/TLS Encryption</a>
     </dd>
 
+    <dt><a name="servernameindication" id="servernameindication">Server Name
+        Indication</a> <a name="sni" id="sni">(SNI)</a></dt>
+    <dd>An SSL function that allows passing the desired server
+      hostname in the initial SSL handshake message, so that the web
+      server can select the correct virtual host configuration to use
+      in processing the SSL handshake.  It was added to SSL starting
+      with the TLS extensions, RFC 3546.  <br />
+      See: <a href="ssl/ssl_faq.html">the SSL FAQ</a>
+      and <a href="http://www.ietf.org/rfc/rfc3546.txt">RFC 3546</a>
+    </dd>
+
     <dt><a name="serversideincludes" id="serversideincludes">Server Side
         Includes</a> <a name="ssi" id="ssi">(SSI)</a></dt>
     <dd>A technique for embedding processing directives inside HTML files.<br />

diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index cd75f3402bcb22a1360b173c896324ec59cb849d..c85d817483de7e21853588c5e9b5e669f9d4b91e 100644 (file)
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -400,6 +400,17 @@
       See: <a href="ssl/">SSL/TLS Encryption</a>
     </dd>
 
+    <dt><a name="servernameindication" id="servernameindication">Server Name
+        Indication</a> <a name="sni" id="sni">(SNI)</a></dt>
+    <dd>An SSL function that allows passing the desired server
+      hostname in the initial SSL handshake message, so that the web
+      server can select the correct virtual host configuration to use
+      in processing the SSL handshake.  It was added to SSL starting
+      with the TLS extensions, RFC 3546.  <br />
+      See: <a href="ssl/ssl_faq.html">the SSL FAQ</a>
+      and <a href="http://www.ietf.org/rfc/rfc3546.txt">RFC 3546</a>
+    </dd>
+
     <dt><a name="serversideincludes" id="serversideincludes">Server Side
         Includes</a> <a name="ssi" id="ssi">(SSI)</a></dt>
     <dd>A technique for embedding processing directives inside HTML files.<br />