From: Daniel Earl Poirier <poirier@apache.org>
Date: Tue, 27 Oct 2009 19:33:27 +0000 (+0000)
Subject: Add SNI to glossary
X-Git-Tag: 2.2.15~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c604df1b299e9b3f6eb41c7265a25a5a7fde391f;p=thirdparty%2Fapache%2Fhttpd.git

Add SNI to glossary

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@830310 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 99b85d62ff7..282f8fd7d00 100644
--- 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 cd75f3402bc..c85d817483d 100644
--- 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 />