Updated Branches:
  refs/heads/trunk e068284b8 -> 3a4349503

FLUME-1613: All of the sink examples in the user guide are broken

(Mike Percy via Brock Noland)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/3a434950
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/3a434950
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/3a434950

Branch: refs/heads/trunk
Commit: 3a43495035efbdd2e67124583827b3a5172bc284
Parents: e068284
Author: Brock Noland <[email protected]>
Authored: Tue Sep 25 21:00:46 2012 -0500
Committer: Brock Noland <[email protected]>
Committed: Tue Sep 25 21:00:46 2012 -0500

----------------------------------------------------------------------
 flume-ng-doc/sphinx/FlumeUserGuide.rst |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/3a434950/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst 
b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 9ab1655..953a670 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -1021,7 +1021,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = hdfsSink-1
   agent_foo.sinks.hdfsSink-1.type = hdfs
-  agent_foo.sinks.hdfsSink-1.channels = memoryChannel-1
+  agent_foo.sinks.hdfsSink-1.channel = memoryChannel-1
   agent_foo.sinks.hdfsSink-1.hdfs.path = /flume/events/%y-%m-%d/%H%M/%S
   agent_foo.sinks.hdfsSink-1.hdfs.filePrefix = events-
   agent_foo.sinks.hdfsSink-1.hdfs.round = true
@@ -1051,7 +1051,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = loggerSink-1
   agent_foo.sinks.loggerSink-1.type = logger
-  agent_foo.sinks.loggerSink-1.channels = memoryChannel-1
+  agent_foo.sinks.loggerSink-1.channel = memoryChannel-1
 
 Avro Sink
 ~~~~~~~~~
@@ -1117,7 +1117,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = ircSink-1
   agent_foo.sinks.ircSink-1.type = irc
-  agent_foo.sinks.ircSink-1.channels = memoryChannel-1
+  agent_foo.sinks.ircSink-1.channel = memoryChannel-1
   agent_foo.sinks.ircSink-1.hostname = irc.yourdomain.com
   agent_foo.sinks.ircSink-1.nick = flume
   agent_foo.sinks.ircSink-1.chan = #flume
@@ -1145,7 +1145,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = fileSink-1
   agent_foo.sinks.fileSink-1.type = FILE_ROLL
-  agent_foo.sinks.fileSink-1.channels = memoryChannel-1
+  agent_foo.sinks.fileSink-1.channel = memoryChannel-1
   agent_foo.sinks.fileSink-1.sink.directory = /var/log/flume
 
 Null Sink
@@ -1168,7 +1168,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = nullSink-1
   agent_foo.sinks.nullSink-1.type = NULL
-  agent_foo.sinks.nullSink-1.channels = memoryChannel-1
+  agent_foo.sinks.nullSink-1.channel = memoryChannel-1
 
 HBaseSinks
 ~~~~~~~~~~
@@ -1216,7 +1216,7 @@ Example for agent named **agent_foo**:
   agent_foo.sinks.hbaseSink-1.table = foo_table
   agent_foo.sinks.hbaseSink-1.columnFamily = bar_cf
   agent_foo.sinks.hbaseSink-1.serializer = 
org.apache.flume.sink.hbase.RegexHbaseEventSerializer
-  agent_foo.sinks.hbaseSink-1.channels = memoryChannel-1
+  agent_foo.sinks.hbaseSink-1.channel = memoryChannel-1
 
 AsyncHBaseSink
 ''''''''''''''
@@ -1256,7 +1256,7 @@ Example for agent named **agent_foo**:
   agent_foo.sinks.hbaseSink-1.table = foo_table
   agent_foo.sinks.hbaseSink-1.columnFamily = bar_cf
   agent_foo.sinks.hbaseSink-1.serializer = 
org.apache.flume.sink.hbase.SimpleAsyncHbaseEventSerializer
-  agent_foo.sinks.hbaseSink-1.channels = memoryChannel-1
+  agent_foo.sinks.hbaseSink-1.channel = memoryChannel-1
 
 Custom Sink
 ~~~~~~~~~~~
@@ -1280,7 +1280,7 @@ Example for agent named **agent_foo**:
   agent_foo.channels = memoryChannel-1
   agent_foo.sinks = customSink-1
   agent_foo.sinks.customSink-1.type = your.namespace.YourClass
-  agent_foo.sinks.customSink-1.channels = memoryChannel-1
+  agent_foo.sinks.customSink-1.channel = memoryChannel-1
 
 Flume Channels
 --------------

Reply via email to