Return-Path: 
 <commits-return-36094-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-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 7E45F1849D
	for <apmail-activemq-commits-archive@www.apache.org>;
 Tue,  5 Jan 2016 15:44:40 +0000 (UTC)
Received: (qmail 4195 invoked by uid 500); 5 Jan 2016 15:44:40 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 4037 invoked by uid 500); 5 Jan 2016 15:44:40 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 4015 invoked by uid 99); 5 Jan 2016 15:44:40 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 15:44:40 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id EABA4E03CE; Tue,  5 Jan 2016 15:44:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: clebertsuconic@apache.org
To: commits@activemq.apache.org
Date: Tue, 05 Jan 2016 15:44:40 -0000
Message-Id: <f6b04082613b400383d279d68e019d4e@git.apache.org>
In-Reply-To: <c0613303c1c44a77a0f3761f80b8ad1d@git.apache.org>
References: <c0613303c1c44a77a0f3761f80b8ad1d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] activemq-artemis git commit: fix security doc

fix security doc


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9c0cc608
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9c0cc608
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9c0cc608

Branch: refs/heads/master
Commit: 9c0cc6085c2436377ce9e43649f0ad7bfa28d0ed
Parents: cdd800d
Author: jbertram <jbertram@apache.org>
Authored: Tue Jan 5 09:05:12 2016 -0600
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Jan 5 10:44:30 2016 -0500

----------------------------------------------------------------------
 docs/user-manual/en/security.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9c0cc608/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 263f268..5bb3372 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -295,9 +295,9 @@ for every case. Just like in the non-JAAS use-case, the first place to look is i
 using the `PropertiesLogin` JAAS login module which reads user, password, and role information from properties files
 much like the non-JAAS security manager implementation:
 
-    <jaas-security login-module="PropertiesLogin"/>
+    <jaas-security domain="PropertiesLogin"/>
     
-No matter what login module you're using, you'll need to specify it here in `bootstrap.xml`. The `login-module` attribute
+No matter what login module you're using, you'll need to specify it here in `bootstrap.xml`. The `domain` attribute
 here refers to the relevant login module entry in `login.config`. For example:
 
     PropertiesLogin {