From 979eedc32846e441e15626c9e54da6a8dffe2e69 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@ansible.com>
Date: Thu, 7 May 2015 15:01:01 -0400
Subject: [PATCH] Fix trademark wording - Tower is a registered trademark

https://trello.com/c/7dFDMl92/464-legal-fix-trademark-wording
---
 awx/ui/static/partials/about.html        | 2 +-
 awx/ui/static/partials/cowsay-about.html | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/awx/ui/static/partials/about.html b/awx/ui/static/partials/about.html
index efde85e4ae..cc2c71571a 100644
--- a/awx/ui/static/partials/about.html
+++ b/awx/ui/static/partials/about.html
@@ -6,7 +6,7 @@
  <div  class="right-side col-sm-8 col-xs-12">
         <img id="about-modal-titlelogo" src="static/img/tower_login_logo.png"><br>
         <p>Tower Version <span id='about-modal-version'></span></p>
-        <textarea class="form-control" rows="3" readonly>Copyright 2015.  All rights reserved.&#10Ansible is a registered trademark of Ansible, Inc.&#10Ansible Tower is a trademark pending registration. </textarea>
+        <textarea class="form-control" rows="2" readonly>Copyright 2015.  All rights reserved.&#10Ansible and Ansible Tower are registered trademarks of Ansible, Inc.&#10</textarea>
         <br>
         <p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information!</p>
 </div>
diff --git a/awx/ui/static/partials/cowsay-about.html b/awx/ui/static/partials/cowsay-about.html
index 7a6e56521f..e4e3fc8a1f 100644
--- a/awx/ui/static/partials/cowsay-about.html
+++ b/awx/ui/static/partials/cowsay-about.html
@@ -19,8 +19,7 @@
         <div  class="col-xs-12 col-sm-7 text-center">
             <img id="about-modal-titlelogo" src="static/img/ansible_tower_logo_minimalc.png"><br>
             <p>Copyright 2015.  All rights reserved.</p>
-            <p>Ansible is a registered trademark of Ansible, Inc.</p>
-            <p>Ansible Tower is a trademark pending registration.</p>
+            <p>Ansible and Ansible Tower are registered trademarks of Ansible, Inc.</p>
             <br>
             <p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information.</p>
     </div>