From: skygo Date: Fri, 28 Sep 2012 00:11:46 +0000 (+0000) Subject: escape curly bracket for some properties X-Git-Tag: archiva-1.4-M3~44 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9a48c74c875321417b120f02c119a0306d910cb0;p=archiva.git escape curly bracket for some properties git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391271 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-docs/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt index 78615435a..09f389736 100644 --- a/archiva-docs/src/site/apt/adminguide/webapp.apt +++ b/archiva-docs/src/site/apt/adminguide/webapp.apt @@ -69,7 +69,7 @@ To deploy Archiva on Tomcat 5.5 and Tomcat 6.0 instead, or see {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668} Bug 40668}} for a workaround. - * The ${appserver.base} java property is used by the Archiva internal logging configuration to determine where to output its logs to. + * The $\{appserver.base\} java property is used by the Archiva internal logging configuration to determine where to output its logs to. It is important to define this property either in the $CATALINA_OPTS system environment variable if Tomcat is being launched via the command line) or the service properties (if being launched as a service or daemon). The format typically expected is -Dappserver.base=. In this example, we'll put the logs in Tomcat's <<>> directory so we need to set appserver.base @@ -83,7 +83,7 @@ OR set CATALINA_OPTS="-Dappserver.home=%CATALINA_HOME% -Dappserver.base=%CATALINA_HOME%" (for Windows) +-----------+ - * If setting the ${appserver.base} and ${appserver.home} using the previous step does not work, you can set it in the unpacked Archiva web application's + * If setting the $\{appserver.base\} and $\{appserver.home\} using the previous step does not work, you can set it in the unpacked Archiva web application's <<>> as follows: +-----------+ @@ -98,7 +98,7 @@ appserver.home=$CATALINA_BASE * When running Tomcat as a <> service, you need to edit <<>> and then, in << SOFTWARE \> Apache Software Foundation \> Procrun 2.0 \> TomcatX \> Parameters \> Java>>>, modify - the <<>> variable. Set the ${appserver.base} property by adding the following parameters at the end: + the <<>> variable. Set the $\{appserver.base\} property by adding the following parameters at the end: +-----------+ -Dappserver.base=%CATALINA_HOME% -Dappserver.home=%CATALINA_HOME%