svn commit: r839039 - in /websites/staging/mina/trunk/content: ./ mina-project/documentation.html mina-project/faq.html

[bu...@apache.org]

Author: buildbot
Date: Wed Nov 21 17:39:27 2012
New Revision: 839039

Log:
Staging update by buildbot for mina

Modified:
    websites/staging/mina/trunk/content/   (props changed)
    websites/staging/mina/trunk/content/mina-project/documentation.html
    websites/staging/mina/trunk/content/mina-project/faq.html

Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Nov 21 17:39:27 2012
@@ -1 +1 @@
-1412191
+1412207

Modified: websites/staging/mina/trunk/content/mina-project/documentation.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/documentation.html (original)
+++ websites/staging/mina/trunk/content/mina-project/documentation.html Wed Nov 21 17:39:27 2012
@@ -183,24 +183,25 @@ The MINA 2.0 User Guide can be found her
 <p>You might also want to read the [frequently asked questions](faq.html] and learn how to <a href="../contact.html">contact us</a> before getting started.</p>
 <h2 id="tutorials">Tutorials</h2>
 <ul>
-<li>[MINA v2.0 Quick Start Guide] - Create your first MINA based program using MINA version 2.0</li>
-<li>[Application Architecture|MINA based Application Architecture] - Describes Architecture&nbsp; of MINA based Applications</li>
-<li>[Logging Configuration] - Configuring your MINA-based application for logging</li>
-<li>Transport-specific Configuration</li>
-<li>[Serial Tutorial] - Serial communications with MINA trunk</li>
-<li>[UDP Tutorial] - Writing a User Datagram Protocol (UDP) client and server using MINA</li>
-<li>[APR Transport] - Describes use of APR Transport with MINA</li>
-<li>[Integrating with Spring] - Demonstrates how to integrate MINA application with Spring</li>
-<li>[Codec Repository|MINA:Codec Repository] - Links to available codec implementations for MINA</li>
-<li>Advanced Topic</li>
-<li>[Writing IoFilter|IoFilter] - Writing your own {{IoFilter}} implementation to deal with cross-cutting concerns</li>
-<li>[Writing Protocol Codec for MINA 2.x|Tutorial on ProtocolCodecFilter (for Mina 2.x)] - Implementing a protocol codec for separation of concern</li>
-<li>[Using an Executor Filter] - Controlling the size of thread pool and choosing the right thread model</li>
-<li>[JMX Integration] - Making your network application manageable</li>
-<li>[Introduction to mina-statemachine] - Implementing state machine based MINA applications using Java5 annotations</li>
-<li>[ErrorGeneratingFilter Tutorial] - Simulating network error by adding a ErrorGeneratingFiler.</li>
-<li>[Handling Packet Fragmentation|Handling Packet Fragementation] - Describes Packet fragmentation and its handling in MINA application</li>
-<li>[User Guide](userguide/user-guide-toc.html] - The new draft MINA User Guide.</li>
+<li><a href="quick-start-guide.html">MINA v2.0 Quick Start Guide</a> - Create your first MINA based program using MINA version 2.0</li>
+<li><a href="userguide/ch12-logging-filter/ch12-logging-filter.html">Logging Configuration</a> - Configuring your MINA-based application for logging</li>
+<li>Transport-specific Configuration<ul>
+<li><a href="userguide/ch6-transports/serial-transport.html">Serial Tutorial</a> - Serial communications with MINA trunk</li>
+<li><a href="userguide/ch6-transports/ch6-transports">UDP Tutorial</a> - Writing a User Datagram Protocol (UDP) client and server using MINA</li>
+<li><a href="userguide/ch6-transports/apr-transport.html">APR Transport</a> - Describes use of APR Transport with MINA</li>
+</ul>
+</li>
+<li><a href="userguide/ch17-spring-integration/ch17-spring-integration.html">Integrating with Spring</a> - Demonstrates how to integrate MINA application with Spring</li>
+<li><a href="codec-repo.html">Codec Repository</a> - Links to available codec implementations for MINA</li>
+<li>Advanced Topic<ul>
+<li><a href="userguide/ch5-filters/ch5-filters.html">Writing IoFilter</a> - Writing your own <em>IoFilter</em> implementation to deal with cross-cutting concerns</li>
+<li><a href="userguide/ch9-codec-filter/ch9-codec-filter.html">Writing Protocol Codec for MINA 2.x</a> - Implementing a protocol codec for separation of concern</li>
+<li><a href="userguide/ch10-executor-filter/ch10-executor-filter.html">Using an Executor Filter</a> - Controlling the size of thread pool and choosing the right thread model</li>
+<li><a href="userguide/ch16-jmx-support/ch16-jmx-support.html">JMX Integration</a> - Making your network application manageable</li>
+<li><a href="userguide/ch14-state-machine/ch14-state-machine.html">Introduction to mina-statemachine</a> - Implementing state machine based MINA applications using Java5 annotations</li>
+</ul>
+</li>
+<li><a href="userguide/user-guide-toc.html">User Guide</a> - The new draft MINA User Guide.</li>
 </ul>
 <h3 id="for-developers">For Developers</h3>
 <ul>

Modified: websites/staging/mina/trunk/content/mina-project/faq.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/faq.html (original)
+++ websites/staging/mina/trunk/content/mina-project/faq.html Wed Nov 21 17:39:27 2012
@@ -200,7 +200,7 @@
 <h3 id="what-is-required-to-buildrun-mina">What is required to build/run MINA?</h3>
 <p>JDK 1.5 or above is required to build MINA. But MINA runs perfect with JDK 1.4 only if you don't use SSLFilter which uses Java 5 SSLEngine. This means JDK 1.5 or above is required for you to use SSL with MINA.</p>
 <p>MINA core module depends on two libraries, SLF4J and backport-util-concurrent (for 1.0):</p>
-<p><a href="http://www.slf4j.org/">SLF4J (Simple Logging Facade for Java)</a></A>, a logging framework from the author of <a href="http://logging.apache.org/log4j/docs/index.html">Log4J</a>. SLF4J is very similar to <a href="http://jakarta.apache.org/commons/logging/">Commons-Logging</a>, but it doesn't cause any class loader issues at all. SLF4J provides bindings for Log4J, JDK 1.4 logging API, and NLog4J. Please put an appropriate SLF4J JAR file which corresponds to your favorite logging framework to the classpath as SLF4J documentation explains.</p>
+<p><a href="http://www.slf4j.org/">SLF4J (Simple Logging Facade for Java)</a></A>, a logging framework from the author of <a href="http://logging.apache.org/log4j/1.2/index.html">Log4J</a>. SLF4J is very similar to <a href="http://jakarta.apache.org/commons/logging/">Commons-Logging</a>, but it doesn't cause any class loader issues at all. SLF4J provides bindings for Log4J, JDK 1.4 logging API, and NLog4J. Please put an appropriate SLF4J JAR file which corresponds to your favorite logging framework to the classpath as SLF4J documentation explains.</p>
 <p><a href="http://www.springframework.org/">Spring framework</a> and <a href="http://www.jcraft.com/jzlib/">JZlib</a> are also required to build <TT>integration-spring</TT> and <TT>filter-compression</TT> module.</p>
 <h3 id="how-can-i-get-help">How can I get help?</h3>
 <p>The primary source to get help is the <a href="userguide/user-guide-toc.html">User Guide</a>.  You can also contact us via <a href="../contact.html">various channels</a> to ask questions on MINA or to contribute to it.</p>