[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.7, 1.8 htaccess-generic, 1.7, 1.8
Brought to you by:
ajlittoz
From: Andre-Littoz <ajl...@us...> - 2013-11-17 09:15:59
|
Update of /cvsroot/lxr/lxr/templates/Apache In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15179/templates/Apache Modified Files: apache-lxrserver.conf htaccess-generic Log Message: templates/Apache/*: improve LCL readability Index: apache-lxrserver.conf =================================================================== RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- apache-lxrserver.conf 3 Sep 2013 08:56:16 -0000 1.7 +++ apache-lxrserver.conf 17 Nov 2013 09:15:55 -0000 1.8 @@ -8,7 +8,8 @@ # directive syntax and semantics changed between releases. # When updating 2.2 -> 2.4, uncomment 2.4 specific lines #@IF !%Apache24% -#@ ASK,Apache24 Is your Apache version 2.4 or higher?; 1; yes, no; y, n +#@ ASK,Apache24 Is your Apache version 2.4 or higher?\ + #@ ; 1; yes, no; y, n #@ENDIF # ================================================= @@ -133,7 +134,12 @@ # ------- URL mapping to LXR directory ------ # #@ ENDIF -#@ IF %_shared% &&('N' eq "%_routing%" || 'A' eq "%_routing%" ||('H' eq "%_routing%" || 'P' eq "%_routing%") && %_commonvirtroot%) +#@ IF %_shared% \ + #@ && ( 'N' eq "%_routing%" \ + #@ || 'A' eq "%_routing%" \ + #@ || ('H' eq "%_routing%" || 'P' eq "%_routing%") \ + #@ && %_commonvirtroot% \ + #@ ) Alias %virtrootbase% "%LXRroot%" #@ ENDIF #@ENDIF Index: htaccess-generic =================================================================== RCS file: /cvsroot/lxr/lxr/templates/Apache/htaccess-generic,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- htaccess-generic 3 Sep 2013 08:56:16 -0000 1.7 +++ htaccess-generic 17 Nov 2013 09:15:55 -0000 1.8 @@ -13,7 +13,8 @@ # directive syntax and semantics changed between releases. # When updating 2.2 -> 2.4, uncomment 2.4 specific lines #@IF !%Apache24% -#@ ASK,Apache24 Is your Apache version 2.4 or higher?; 1; yes, no; y, n +#@ ASK,Apache24 Is your Apache version 2.4 or higher?\ + #@ ; 1; yes, no; y, n #@ENDIF |