From: Eric Covener Date: Sat, 17 Sep 2016 20:42:13 +0000 (+0000) Subject: bld break in hand-resolved conflict X-Git-Tag: 2.4.24~240 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82e36d9c4cd3797004a0cb79fffc77e4a8c46fea;p=thirdparty%2Fapache%2Fhttpd.git bld break in hand-resolved conflict git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1761275 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml index 6226f213fb4..18bf9f37858 100644 --- a/docs/manual/expr.xml +++ b/docs/manual/expr.xml @@ -475,7 +475,7 @@ listfunction ::= listfuncname "(" word ")" Get HTTP response header reqenv Lookup request environment variable (as a shortcut, - v can also be used to access variables). + v can also be used to access variables). ordering osenv Lookup operating system environment variable