svn commit: r1400148 - in /logging/log4j/log4j2/trunk: flume-og/ src/site/site.xml src/site/xdoc/manual/appenders.xml

[rg...@apache.org]

Author: rgoers
Date: Fri Oct 19 16:09:16 2012
New Revision: 1400148

URL: http://svn.apache.org/viewvc?rev=1400148&view=rev
Log:
Remove Flume OG

Removed:
    logging/log4j/log4j2/trunk/flume-og/
Modified:
    logging/log4j/log4j2/trunk/src/site/site.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml

Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1400148&r1=1400147&r2=1400148&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Fri Oct 19 16:09:16 2012
@@ -82,7 +82,7 @@
         <item name="Console" href="/manual/appenders.html#ConsoleAppender"/>
         <item name="Failover" href="/manual/appenders.html#FailoverAppender"/>
         <item name="File" href="/manual/appenders.html#FileAppender"/>
-        <item name="Flume" href="/manual/appenders.html#FlumeAvroAppender"/>
+        <item name="Flume" href="/manual/appenders.html#FlumeAppender"/>
         <item name="JMSQueue" href="/manual/appenders.html#JMSQueueAppender"/>
         <item name="JSMTopic" href="/manual/appenders.html#JMSTopicAppender"/>
         <item name="OutputStream" href="/manual/appenders.html#OutputStreamAppender"/>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1400148&r1=1400147&r2=1400148&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Fri Oct 19 16:09:16 2012
@@ -360,12 +360,6 @@
             and available system for efficiently collecting, aggregating, and moving large amounts of log data
             from many different sources to a centralized data store. The FlumeAppender takes LogEvents and sends
             them to a Flume agent as serialized Avro events for consumption.</p>
-          <p><i>Note:</i><br/>
-            There are two versions of the Flume Appender in the source control. The first is for "Flume OG", the
-            original version of Flume before it became an Apache project. The second is for "Flume NG", which is
-            maintained by the Apache Flume project. Only the Flume NG appender is included in Log4j 2 releases as
-            Flume OG itself is considered deprecated.
-          </p>
           <p>
             The Flume Appender supports two modes of operation.
             <ol>