From: Christophe Jaillet Date: Tue, 27 Jan 2015 20:02:36 +0000 (+0000) Subject: Improve r1525489 (one line with a "-" was forgotten) and synch with 2.4.x X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=113034800ca381759a225e58d737b62315f540e2;p=thirdparty%2Fapache%2Fhttpd.git Improve r1525489 (one line with a "-" was forgotten) and synch with 2.4.x git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655141 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/ssl/ssl_intro.html.en b/docs/manual/ssl/ssl_intro.html.en index bdc7dd229f3..2eeb1656d16 100644 --- a/docs/manual/ssl/ssl_intro.html.en +++ b/docs/manual/ssl/ssl_intro.html.en @@ -400,7 +400,7 @@ establishing a protocol session.

Proposed Internet Standard (from IETF) [TLS11] Update of TLS 1.0 to add protection against Cipher block chaining (CBC) attacks. - - + TLS v1.2 Proposed Internet Standard (from IETF) [TLS12] Update of TLS 1.2 deprecating MD5 as hash, and adding incompatibility diff --git a/docs/manual/ssl/ssl_intro.xml b/docs/manual/ssl/ssl_intro.xml index c7abd3f77fe..eccf050bc38 100644 --- a/docs/manual/ssl/ssl_intro.xml +++ b/docs/manual/ssl/ssl_intro.xml @@ -408,7 +408,7 @@ establishing a protocol session.

>TLS11] Update of TLS 1.0 to add protection against Cipher block chaining (CBC) attacks. - - + TLS v1.2 Proposed Internet Standard (from IETF) [TLS12]