From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 17 Oct 2014 01:31:07 +0000 (-0700)
Subject: Fix Release Notes typos for 3.5
X-Git-Tag: merge-candidate-3-v1~541
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86d745050b83803217272986fe45920b0cf84d77;p=thirdparty%2Fsquid.git

Fix Release Notes typos for 3.5
---

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 3e53dc7755..19d5e8d800 100644
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -205,8 +205,7 @@ Most user-facing changes are reflected in squid.conf (see below).
    <em>ftp://</em> URIs because Squid works as an FTP server and receives
    actual FTP commands (rather than HTTP requests with FTP URLs).
 
-<p>FTP Relay highlights:</p>
-
+<p>FTP Relay highlights:
 <itemize>
     <item>Added ftp_port directive telling Squid to relay native FTP commands.
     <item>Active and passive FTP support on the user-facing side; require
@@ -245,25 +244,25 @@ Most user-facing changes are reflected in squid.conf (see below).
    trusted to send correct client details.
 
 <p>Forward-proxy traffic from a client proxy:
-<verbatim>
+<verb>
  acl frontend src 192.0.2.1
  http_port 3128 require-proxy-header
  proxy_protocol_access allow frontend
-</verbatim>
+</verb>
 
 <p>Intercepted traffic from a client proxy or tunnel:
-<verbatim>
+<verb>
  acl frontend src 192.0.2.2
  http_port 3128 intercept require-proxy-header
  proxy_protocol_access allow frontend
-</verbatim>
+</verb>
 
 <p>Reverse-proxy traffic from a frontend load balancer sending PROXY protocol:
-<verbatim>
+<verb>
  acl frontend src 192.0.2.3
  http_port 3128 accel require-proxy-header
  proxy_protocol_access allow frontend
-</verbatim>
+</verb>
 
 <p><em>Known Issue:</em>
    Use of <em>require-proxy-header</em> on <em>https_port</em> and <em>ftp_port</em> is not supported.
@@ -423,7 +422,7 @@ This section gives a thorough account of those changes in three categories:
 	<tag>http_port</tag>
 	<p><em>protocol=</em> option altered to accept protocol version details.
 	   Currently supported values are: HTTP, HTTP/1.1, HTTPS, HTTPS/1.1
-	<p><em>New option <em>require-proxy-header</em> to mark ports receiving PROXY
+	<p>New option <em>require-proxy-header</em> to mark ports receiving PROXY
 	   protocol version 1 or 2 traffic.
 
 	<tag>https_port</tag>