You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/31 18:05:57 UTC
isis-site git commit: ISIS-1082: externalized config;
correcting Luke Hutchison's name
Repository: isis-site
Updated Branches:
refs/heads/asf-site 396e16aaf -> 10cafe680
ISIS-1082: externalized config; correcting Luke Hutchison's name
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/10cafe68
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/10cafe68
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/10cafe68
Branch: refs/heads/asf-site
Commit: 10cafe680948d445af6f845faef1fbf924493d7d
Parents: 396e16a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 31 17:03:57 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 31 17:03:57 2015 +0100
----------------------------------------------------------------------
content/guides/ug.html | 16 +++++++++++++++-
content/more-thanks.html | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/10cafe68/content/guides/ug.html
----------------------------------------------------------------------
diff --git a/content/guides/ug.html b/content/guides/ug.html
index 71e355b..e0afc29 100644
--- a/content/guides/ug.html
+++ b/content/guides/ug.html
@@ -12546,9 +12546,23 @@ configuration should be read from an external location.</p>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><Parameter</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">isis.config.dir</span><span class="delimiter">"</span></span>
<span class="attribute-name">value</span>=<span class="string"><span class="delimiter">"</span><span class="content">/usr/local/tomcat/myapp/conf/</span><span class="delimiter">"</span></span>
- <span class="attribute-name">override</span>=<span class="string"><span class="delimiter">"</span><span class="content">true</span><span class="delimiter">"</span></span><span class="tag">/></span></code></pre>
+ <span class="attribute-name">override</span>=<span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span><span class="tag">/></span></code></pre>
</div>
</div>
+<div class="admonitionblock important">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-important" title="Important"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>Note that the <code>override</code> key should be set to "false"; not "true"; it indicates whether this parameter is overridable by the application’s own <code>web.xml</code>. In most cases, you probably want to disallow that.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
<div class="paragraph">
<p>For more detail, see the Tomcat documentation on <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Defining_a_context">defining a context</a> and on <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters">context parameters</a>.</p>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/10cafe68/content/more-thanks.html
----------------------------------------------------------------------
diff --git a/content/more-thanks.html b/content/more-thanks.html
index fd7b591..6374f70 100644
--- a/content/more-thanks.html
+++ b/content/more-thanks.html
@@ -544,7 +544,7 @@ table.CodeRay td.code>pre{padding:0}
<p><a href="https://github.com/mojavelinux">Dan Allen</a> for his fantastic work on <a href="https://github.com/asciidoctor/asciidoctor">Asciidoctor</a></p>
</li>
<li>
-<p><a href="https://github.com/lukehutch">Luke Hutch</a> for his <a href="https://github.com/lukehutch/fast-classpath-scanner">fast-classpath-scanner</a>, in particular for merging in our PR for Java 7 support and releasing so quickly</p>
+<p><a href="https://github.com/lukehutch">Luke Hutchison</a> for his <a href="https://github.com/lukehutch/fast-classpath-scanner">fast-classpath-scanner</a>, in particular for merging in our PR for Java 7 support and releasing so quickly</p>
</li>
<li>
<p><a href="https://github.com/krasa/MavenHelper">Vojtech Krasa</a> for his super <a href="https://github.com/krasa/MavenHelper">MavenHelper</a> plugin to IntelliJ</p>