You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2012/07/09 07:12:35 UTC
svn commit: r1358915 - in /flume/branches/branch-1.2.0: ./
flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
flume-ng-doc/sphinx/FlumeUserGuide.rst flume-ng-doc/sphinx/conf.py
flume-ng-doc/sphinx/index.rst
Author: mpercy
Date: Mon Jul 9 05:12:35 2012
New Revision: 1358915
URL: http://svn.apache.org/viewvc?rev=1358915&view=rev
Log:
FLUME-1348. Docs updates.
(Hari Shreedharan via Mike Percy)
Modified:
flume/branches/branch-1.2.0/ (props changed)
flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeUserGuide.rst
flume/branches/branch-1.2.0/flume-ng-doc/sphinx/conf.py
flume/branches/branch-1.2.0/flume-ng-doc/sphinx/index.rst
Propchange: flume/branches/branch-1.2.0/
------------------------------------------------------------------------------
svn:mergeinfo = /flume/trunk:1358887
Modified: flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst?rev=1358915&r1=1358914&r2=1358915&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst (original)
+++ flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst Mon Jul 9 05:12:35 2012
@@ -28,11 +28,11 @@ Apache Flume is a distributed, reliable,
efficiently collecting, aggregating and moving large amounts of log
data from many different sources to a centralized data store.
-At the moment Flume is an incubating Apache project. There are
-currently two release code lines available, version 0.9.x and 1.x.x. This guide
-is specific to 1.x (more specifically 1.1.0 release). Please click here for
-`the Flume 0.9.x Developer Guide
-<http://archive.cloudera.com/cdh/3/flume/DeveloperGuide/>`_.
+Apache Flume is a top level project at the Apache Software Foundation.
+There are currently two release code lines available, version 0.9.x and 1.x.x.
+This guide is specific to 1.x (more specifically 1.1.0 release).
+Please click here for
+`the Flume 0.9.x Developer Guide <http://archive.cloudera.com/cdh/3/flume/DeveloperGuide/>`_.
Architecture
------------
@@ -83,12 +83,12 @@ Getting the source
~~~~~~~~~~~~~~~~~~
Check out the code using Subversion. Click here for
-`the SVN repository root <http://svn.apache.org/repos/asf/incubator/flume/>`_.
+`the SVN repository root <http://svn.apache.org/repos/asf/flume/>`_.
The Flume 1.x development happens under the branch "trunk" so this command line
can be used::
- svn checkout http://svn.apache.org/repos/asf/incubator/flume/trunk flume-trunk
+ svn checkout http://svn.apache.org/repos/asf/flume/trunk flume-trunk
Alternatively, if you prefer using Git, you may use::
Modified: flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeUserGuide.rst
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeUserGuide.rst?rev=1358915&r1=1358914&r2=1358915&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeUserGuide.rst (original)
+++ flume/branches/branch-1.2.0/flume-ng-doc/sphinx/FlumeUserGuide.rst Mon Jul 9 05:12:35 2012
@@ -28,10 +28,11 @@ Apache Flume is a distributed, reliable,
collecting, aggregating and moving large amounts of log data from many
different sources to a centralized data store.
-At the moment Flume is an incubating Apache project. There are currently two
-release code lines available, version 0.9.x and 1.x.x. This guide is specific
-to 1.x (more specifically 1.1.0 release). Please click here for `the Flume
-0.9.x User Guide <http://archive.cloudera.com/cdh/3/flume/UserGuide/>`_.
+Apache Flume is a top level project at the Apache Software Foundation.
+There are currently two release code lines available, version 0.9.x and 1.x.x.
+This guide is specific to 1.x (more specifically 1.1.0 release).
+Please click here for
+`the Flume 0.9.x User Guide <http://archive.cloudera.com/cdh/3/flume/UserGuide/>`_.
System Requirements
-------------------
@@ -1530,7 +1531,7 @@ Log4J Appender
Appends Log4j events to a flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-1.2.0-incubating-SNAPSHOT.jar).
+flume-ng-sdk-1.3.0-SNAPSHOT.jar).
Required properties are in **bold**.
============= ======= ==========================================================================
Modified: flume/branches/branch-1.2.0/flume-ng-doc/sphinx/conf.py
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-doc/sphinx/conf.py?rev=1358915&r1=1358914&r2=1358915&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-doc/sphinx/conf.py (original)
+++ flume/branches/branch-1.2.0/flume-ng-doc/sphinx/conf.py Mon Jul 9 05:12:35 2012
@@ -56,7 +56,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = 'Apache Flume (incubating)'
+project = 'Apache Flume'
copyright = '2009-2012 The Apache Software Foundation'
keep_warnings = True
Modified: flume/branches/branch-1.2.0/flume-ng-doc/sphinx/index.rst
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-doc/sphinx/index.rst?rev=1358915&r1=1358914&r2=1358915&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-doc/sphinx/index.rst (original)
+++ flume/branches/branch-1.2.0/flume-ng-doc/sphinx/index.rst Mon Jul 9 05:12:35 2012
@@ -15,7 +15,7 @@
=======================================
-Apache Flume (incubating) documentation
+Apache Flume documentation
=======================================
Flume is a distributed, reliable, and available system for efficiently
@@ -50,7 +50,7 @@ Overview
- `Flume Wiki <http://cwiki.apache.org/confluence/display/FLUME>`_
- `Getting Started Guide <http://cwiki.apache.org/confluence/display/FLUME/Getting+Started>`_
- `Flume Issue Tracking (JIRA) <https://issues.apache.org/jira/browse/FLUME>`_
-- `Flume Source Code (SVN) <https://svn.apache.org/repos/asf/incubator/flume/>`_
+- `Flume Source Code (SVN) <http://svn.apache.org/repos/asf/flume/>`_
Documentation
-------------