The branch, master has been updated
via a2eb7c52b0312856e6f4c67670a4a11df4272780 (commit)
from 392672023cda2281b905c62f730cdd3b585aa853 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=a2eb7c52b0312856e6f4c67670a4a11df4272780
http://github.com/ceki/logback/commit/a2eb7c52b0312856e6f4c67670a4a11df4272780
commit a2eb7c52b0312856e6f4c67670a4a11df4272780
Author: Ceki Gulcu <c...@qos.ch>
Date: Wed Oct 28 22:54:50 2009 +0100
- Applied
http://github.com/cehjohnson/logback/commit/2194ab44141abed25479ec00e4a88b4fc27c4f68
from October 04, 2009
However, the ">" to ">" transformation has been ignored and will continue
to be so in the future.
diff --git a/logback-site/src/site/pages/manual/configuration.html
b/logback-site/src/site/pages/manual/configuration.html
index f725cf7..3971387 100644
--- a/logback-site/src/site/pages/manual/configuration.html
+++ b/logback-site/src/site/pages/manual/configuration.html
@@ -64,14 +64,14 @@
<p>Inserting log requests into the application code requires a
fair amount of planning and effort. Observation shows that
approximately four percent of code is dedicated to
- logging. Consequently, even moderately sized applications will
+ logging. Consequently, even a moderately sized application will
contain thousands of logging statements embedded within its
code. Given their number, we need tools to manage these log
statements.
</p>
- <p>Logback can be configured either programmatically or with
- configuration a script (expressed in XML format). By the way,
+ <p>Logback can be configured either programmatically or with a
+ configuration script (expressed in XML format). By the way,
existing log4j users can convert their <em>log4j.properties</em>
files to <em>logback.xml</em> using our <a
href="http://logback.qos.ch/translator/";>PropertiesTranslator</a>
@@ -124,7 +124,7 @@
<h3>Automatically configuring logback</h3>
<p>The simplest way to configure logback is by letting logback
- fallback to its default configuration. Let us give a taste of how
+ fall back to its default configuration. Let us give a taste of how
this is done in an imaginary application called
<code>MyApp1</code>.
</p>
@@ -213,8 +213,8 @@ public class Foo {
<p>The <code>MyApp1</code> application links to logback via calls
<code>org.slf4j.LoggerFactory</code> and
<code>org.slf4j.Logger</code> classes, retrieve the loggers it
- wishes to use, and chugs on. Note that the only dependence of the
- <code>Foo</code> class on logback are through
+ wishes to use, and chugs on. Note that the only dependencies of
+ the <code>Foo</code> class on logback are through
<code>org.slf4j.LoggerFactory</code> and
<code>org.slf4j.Logger</code> imports. Except code that configures
logback (if such code exists) client code does not need to depend
@@ -350,14 +350,14 @@ public class Foo {
<li>the configuration file is well-formed XML.</li>
</ol>
- <p>If any of these two conditions is not fulfilled, the Joran
- cannot interpret <code>debug</code> attribute since the
- configuration file cannot be read. If the configuration file is
- found but is ill-formed, then logback will detect the error
- condition and automatically print its internal status on the
- console. However, if the configuration file cannot be found, since
- this is not necessarily an error condition, logback will not
- automatically print its status data. Programmatically invoking
+ <p>If any of these two conditions is not fulfilled, Joran cannot
+ interpret <code>debug</code> attribute since the configuration file
+ cannot be read. If the configuration file is found but is
+ ill-formed, then logback will detect the error condition and
+ automatically print its internal status on the console. However, if
+ the configuration file cannot be found, since this is not
+ necessarily an error condition, logback will not automatically
+ print its status data. Programmatically invoking
<code>StatusPrinter.print()</code>, as as in <em>MyApp2</em>
application above, ensures that status information is always
printed.
@@ -462,7 +462,7 @@ public class Foo {
override logback's default configuration mechanism, you can do so
by invoking <code>JoranConfigurator</code> directly. The next
application, <em>MyApp3</em>, invokes JoranConfigurator on a
- configuration file passed as parameter.</p>
+ configuration file passed as a parameter.</p>
<p><em>Example 3.<span class="autoEx"/>: Invoking
<code>JoranConfigurator</code> directly <a
@@ -528,7 +528,7 @@ public class MyApp3 {
<p>Given a <code>StatusManager</code> you an access all the status
data associated with a logback context. To keep memory usage at
reasonable levels, the default <code>StatusManager</code>
- implementation stores the status messages in two separate parts,
+ implementation stores the status messages in two separate parts:
the header part and the tail part. The header part stores the fist
<em>H</em> status messages whereas the tail part stores the last
<em>T</em> messages. At present time <em>H</em>=<em>T</em>=150,
@@ -585,7 +585,7 @@ public class MyApp3 {
<p>Here is <a
href="../xref/chapter3/AddStatusListenerApp.html">sample code</a>
- to register a OnConsoleStatusListener instance with the
+ to register an OnConsoleStatusListener instance with the
StatusManager.
</p>
@@ -637,12 +637,12 @@ public class MyApp3 {
</p>
<p>As shall become clear, the syntax of logback configuration files
- is extremely flexible. As such, it is not possible specify the
- allowed syntax with a DTD file or an XML Schema. Nevertheless, the
- very basic structure of configuration can be described as,
+ is extremely flexible. As such, it is not possible to specify the
+ allowed syntax with a DTD file or an XML schema. Nevertheless, the
+ very basic structure of the configuration file can be described as,
<configuration> element, followed by zero or more <appender>
- elements, followed by by zero or more <logger> elements, followed
- by at most one <root> element. The following diagram illustrates
+ elements, followed by zero or more <logger> elements, followed by
+ at most one <root> element. The following diagram illustrates
this basic structure.</p>
diff --git a/logback-site/src/site/pages/manual/introduction.html
b/logback-site/src/site/pages/manual/introduction.html
index f8b0581..90259f0 100644
--- a/logback-site/src/site/pages/manual/introduction.html
+++ b/logback-site/src/site/pages/manual/introduction.html
@@ -193,7 +193,7 @@ public class HelloWorld2 {
larger application would not be that different. The general pattern
for logging statements would not change. Only the configuration
process would be different. However, you would probably want to
- customize or configure logback according to your needs. Logback
+ customize or configure logback according to your needs. Logback
configuration will be covered in subsequent chapters.
</p>
-----------------------------------------------------------------------
Summary of changes:
.../src/site/pages/manual/configuration.html | 44 ++++++++++----------
.../src/site/pages/manual/introduction.html | 2 +-
2 files changed, 23 insertions(+), 23 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
_______________________________________________
logback-dev mailing list
logback-dev@qos.ch
http://qos.ch/mailman/listinfo/logback-dev
