summaryrefslogtreecommitdiffstats
path: root/archiva-docs
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2014-03-20 23:28:10 +0000
committerOlivier Lamy <olamy@apache.org>2014-03-20 23:28:10 +0000
commit269ede5bf074376a507385bba990255624b811a0 (patch)
treee240903341a18b1823ea77b834c82a1302a079f2 /archiva-docs
parente72bb0a3a27a83430b5005af30d075b7334a2213 (diff)
downloadarchiva-269ede5bf074376a507385bba990255624b811a0.tar.gz
archiva-269ede5bf074376a507385bba990255624b811a0.zip
fix wrong merge
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1579832 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-docs')
-rw-r--r--archiva-docs/src/site/apt/adminguide/logging.apt1
1 files changed, 0 insertions, 1 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/logging.apt b/archiva-docs/src/site/apt/adminguide/logging.apt
index 8ab016bb9..8efdb0bb4 100644
--- a/archiva-docs/src/site/apt/adminguide/logging.apt
+++ b/archiva-docs/src/site/apt/adminguide/logging.apt
@@ -46,6 +46,5 @@ Log Files
If you are in a constrained environment, you can change it to Block (or Yield) (<<<-DAsyncLogger.WaitStrategy=Block>>> and/or
<<<-DAsyncLoggerConfig.WaitStrategy=Block>>>)
- This mean per default AsyncLoggerConfig.WaitStrategy option is configured to Sleep.
(See {{{http://logging.apache.org/log4j/2.x/manual/async.html}log4j2 documentation}} )