Return-Path: 
 <commits-return-1410-apmail-flume-commits-archive=flume.apache.org@flume.apache.org>
X-Original-To: apmail-flume-commits-archive@www.apache.org
Delivered-To: apmail-flume-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2244CE77F
	for <apmail-flume-commits-archive@www.apache.org>;
 Wed, 19 Dec 2012 16:47:55 +0000 (UTC)
Received: (qmail 10876 invoked by uid 500); 19 Dec 2012 16:47:55 -0000
Delivered-To: apmail-flume-commits-archive@flume.apache.org
Received: (qmail 10818 invoked by uid 500); 19 Dec 2012 16:47:55 -0000
Mailing-List: contact commits-help@flume.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flume.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flume.apache.org>
List-Post: <mailto:commits@flume.apache.org>
List-Id: <commits.flume.apache.org>
Reply-To: dev@flume.apache.org
Delivered-To: mailing list commits@flume.apache.org
Received: (qmail 10764 invoked by uid 99); 19 Dec 2012 16:47:55 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 16:47:55 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id AED2D3240F9; Wed, 19 Dec 2012 16:47:54 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brock@apache.org
To: commits@flume.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: FLUME-1802: Missing parameter --conf in example of the
 Flume User Guide
Message-Id: <20121219164754.AED2D3240F9@tyr.zones.apache.org>
Date: Wed, 19 Dec 2012 16:47:54 +0000 (UTC)

Updated Branches:
  refs/heads/flume-1.4 8a3b6357c -> 2867e4563


FLUME-1802: Missing parameter --conf in example of the Flume User Guide

(Oliver B. Fischer 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/2867e456
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2867e456
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2867e456

Branch: refs/heads/flume-1.4
Commit: 2867e4563e4d1e5984e402bbc037c39412abc295
Parents: 8a3b635
Author: Brock Noland <brock@apache.org>
Authored: Wed Dec 19 10:47:21 2012 -0600
Committer: Brock Noland <brock@apache.org>
Committed: Wed Dec 19 10:47:33 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/flume/blob/2867e456/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 69860f7..63b8f9b 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -188,7 +188,7 @@ several named agents; when a given Flume process is launched a flag is passed te
 
 Given this configuration file, we can start Flume as follows::
 
-  $ bin/flume-ng agent --conf-file example.conf --name a1 -Dflume.root.logger=INFO,console
+  $ bin/flume-ng agent --conf conf --conf-file example.conf --name a1 -Dflume.root.logger=INFO,console
 
 Note that in a full deployment we would typically include one more option: ``--conf=<conf-dir>``.
 The ``<conf-dir>`` directory would include a shell script *flume-env.sh* and potentially a log4j properties file.