The branch, master has been updated via d3e8a64dce1edb3c769101d874cae1f090f3021b (commit) via 79cf4f778bceef507f145ea4b66f07a9ee4600da (commit) from 3ad0c4474488b4c967e504acb7b9598200a5a048 (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=d3e8a64dce1edb3c769101d87... http://github.com/ceki/logback/commit/d3e8a64dce1edb3c769101d874cae1f090f302... commit d3e8a64dce1edb3c769101d874cae1f090f3021b Merge: 79cf4f7 3ad0c44 Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Oct 14 23:11:49 2009 +0200 Merge branch 'master' of git.qos.ch:logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=79cf4f778bceef507f145ea4b... http://github.com/ceki/logback/commit/79cf4f778bceef507f145ea4b66f07a9ee4600... commit 79cf4f778bceef507f145ea4b66f07a9ee4600da Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Oct 14 23:10:48 2009 +0200 - pom packaging is more appropriate for the logback-sire module - editing bugreport.html and license.html diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 7f118ae..3da1644 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -10,7 +10,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-site</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <version>${parent.version}</version> <name>Logback Site</name> diff --git a/logback-site/src/site/pages/bugreport.html b/logback-site/src/site/pages/bugreport.html index dbc779f..cea7681 100644 --- a/logback-site/src/site/pages/bugreport.html +++ b/logback-site/src/site/pages/bugreport.html @@ -68,15 +68,15 @@ for logback bugs</a></li> </ul> - <h2>Reporting with bugs</h2> + <h3>Reporting a bug</h3> <p>Only after you have exhausted the aforementioned steps, should you file a formal report in JIRA, our bug tracking system. </p> <p>Please make sure you provide as much information as possible. - Its very hard to fix a bug if the person looking into the problem - can't reproduce it. + It is hard to fix a bug if the person looking into the problem + cannot reproduce it. </p> <ul> diff --git a/logback-site/src/site/pages/license.html b/logback-site/src/site/pages/license.html index 0bc88a2..af320a8 100644 --- a/logback-site/src/site/pages/license.html +++ b/logback-site/src/site/pages/license.html @@ -48,14 +48,15 @@ as published by the Free Software Foundation.</p> </p> <p>The EPL/LGPL dual-license serves several purposes. The LGPL - license ensures <em>continuity</em> in tems of licensing of the + license ensures <em>continuity</em> in terms of licensing of the logback project. Prior to version 0.9.18, logback was licensed (exlusively) under the LGPL v2.1. Moreover, since the EPL is deemed <a href="http://www.fsf.org/licensing/licenses/index_htm">incompatible</a> by the Free Software Foundation, the LGPL will allow various - licensees, in particular software distributors, who may be already - bound by the terms of the GPL or the LGPL. + licensees, in particular software distributors who may be already + bound by the terms of the GPL or the LGPL, to distribute our + software. </p> <p>On the other hand, the EPL license will placate organizations ----------------------------------------------------------------------- Summary of changes: logback-site/pom.xml | 2 +- logback-site/src/site/pages/bugreport.html | 6 +++--- logback-site/src/site/pages/license.html | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.