From af763c287e2c6e52b814571f246d38bf6ca399f8 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Wed, 28 Jan 2015 16:21:15 -0500
Subject: [PATCH 1/2] Update text in Studio footer as per legal

[OPEN-444]
---
 cms/templates/widgets/footer.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html
index 14d0fc63a0..707efdcd20 100644
--- a/cms/templates/widgets/footer.html
+++ b/cms/templates/widgets/footer.html
@@ -4,7 +4,15 @@
 <div class="wrapper-footer wrapper">
   <footer class="primary" role="contentinfo">
     <div class="colophon">
-      <p>&copy; ${settings.COPYRIGHT_YEAR} <a href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>. ${ _("All rights reserved.")}</p>
+      <p>&copy; ${settings.COPYRIGHT_YEAR} <a href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>.</p>
+      ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
+      <p>
+	## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
+	${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
+	  link_start=u"<a href='https://www.edx.org/'>",
+	  link_end=u"</a>"
+	)}
+      </p>
     </div>
 
     <nav class="nav-peripheral">

From 2fd7657e0fe9dfde6e3630d8076ff7d18d750ab5 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Wed, 28 Jan 2015 16:26:17 -0500
Subject: [PATCH 2/2] Update text in LMS footer as per legal

[OPEN-444]
---
 lms/templates/footer-edx-new.html | 17 +++++++++++------
 lms/templates/footer.html         | 14 +++++++++-----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html
index b0a9d6f091..7e6481fb40 100644
--- a/lms/templates/footer-edx-new.html
+++ b/lms/templates/footer-edx-new.html
@@ -30,12 +30,17 @@
       </div>
 
       <div class="footer-about-copyright">
-        ## Translators: '&copy;' is an HTML character code for the copyright symbol. Please don't remove or change it.
-        <p>${_("&copy; {copyright_year} {platform_name}, some rights reserved").format(
-          platform_name=settings.PLATFORM_NAME,
-          copyright_year=settings.COPYRIGHT_YEAR
-        )}
-      </p>
+	## Using "edX Inc." explicitly here for copyright purposes (settings.PLATFORM_NAME is just "edX", and this footer is only used on edx.org)
+	<p>&copy; ${settings.COPYRIGHT_YEAR} edX Inc.</p>
+
+	## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
+	<p>
+	  ## Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
+	  ${_("EdX, Open edX, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
+	      link_start=u"<a href='https://www.edx.org/'>",
+	      link_end=u"</a>"
+	  )}
+	</p>
       </div>
 
       <div class="footer-about-links">
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index c7a1a34795..d8a4c94380 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -51,11 +51,15 @@
         </p>
       </div>
 
-      ## Translators: '&copy;' is an HTML character code for the copyright symbol. Please don't remove or change it.
-      <p class="copyright">${_("&copy; {copyright_year} {platform_name}, some rights reserved").format(
-        platform_name=settings.PLATFORM_NAME,
-        copyright_year=settings.COPYRIGHT_YEAR
-      )}
+      <p class="copyright">&copy; ${settings.COPYRIGHT_YEAR} ${settings.PLATFORM_NAME}.</p>
+
+      ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
+      <p class="copyright">
+	## Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names.
+	${_("EdX, Open edX, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format(
+	    link_start=u"<a href='https://www.edx.org/'>",
+	    link_end=u"</a>"
+	)}
       </p>
         <nav class="nav-legal">
           <ul>