Return-Path: 
 <allura-commits-return-6976-apmail-incubator-allura-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5ABF9F113
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Fri,  4 Oct 2013 21:09:21 +0000 (UTC)
Received: (qmail 64416 invoked by uid 500); 4 Oct 2013 21:09:20 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 64344 invoked by uid 500); 4 Oct 2013 21:09:20 -0000
Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:allura-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:allura-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:allura-commits@incubator.apache.org>
List-Id: <allura-commits.incubator.apache.org>
Reply-To: allura-dev@incubator.apache.org
Delivered-To: mailing list allura-commits@incubator.apache.org
Received: (qmail 64304 invoked by uid 99); 4 Oct 2013 21:09:17 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Oct 2013 21:09:17 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 06AFE90FF63; Fri,  4 Oct 2013 21:09:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: johnsca@apache.org
To: allura-commits@incubator.apache.org
Date: Fri, 04 Oct 2013 21:09:16 -0000
Message-Id: <d39b6c0cafaa4f29af0f5e3052383c70@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] git commit: [#6692] Fixed typo

Updated Branches:
  refs/heads/cj/6692 fb8bc7803 -> 771c534cf (forced update)


[#6692] Fixed typo

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e4d3c13c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e4d3c13c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e4d3c13c

Branch: refs/heads/cj/6692
Commit: e4d3c13cadadf91f0a211c38ac6a5c58dca18d70
Parents: 3b9ea01
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Thu Sep 26 18:20:29 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Fri Oct 4 21:06:35 2013 +0000

----------------------------------------------------------------------
 Allura/allura/templates/oauth_applications.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e4d3c13c/Allura/allura/templates/oauth_applications.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/oauth_applications.html b/Allura/allura/templates/oauth_applications.html
index 75b1436..90ba2ea 100644
--- a/Allura/allura/templates/oauth_applications.html
+++ b/Allura/allura/templates/oauth_applications.html
@@ -115,9 +115,9 @@
     <p>
     These are the applications you have registered.  They can request authorization
     for a user using the Consumer Key and Consumer Secret via OAuth negotiation.
-    Alternatively, you can generate a bearer token to give your applicationa access
+    Alternatively, you can generate a bearer token to give your application access
     to your account without having to perform the OAuth negotiation.  Note, however,
-    that you must be careful with bearer tokens, since anyone who has them token can
+    that you must be careful with bearer tokens, since anyone who has the token can
     access your account as that application.
     </p>
     {% for consumer_token in consumer_tokens %}