launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #32740
[Merge] ~vaishnavi-asawale/launchpad/+git/launchpad-1:update-terms-of-use-redirect into launchpad:master
Vaishnavi Asawale has proposed merging ~vaishnavi-asawale/launchpad/+git/launchpad-1:update-terms-of-use-redirect into launchpad:master.
Commit message:
Update 'Terms of Use' redirection link
Update the 'Terms of Use' section in the footer of the Launchpad
page to redirect to the 'Launchpad Terms of Service' in ubuntu.com
rather than the Launchpad Manual homepage.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~vaishnavi-asawale/launchpad/+git/launchpad-1/+merge/488970
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~vaishnavi-asawale/launchpad/+git/launchpad-1:update-terms-of-use-redirect into launchpad:master.
diff --git a/lib/lp/app/browser/doc/base-layout.rst b/lib/lp/app/browser/doc/base-layout.rst
index 0eb6852..7177a61 100644
--- a/lib/lp/app/browser/doc/base-layout.rst
+++ b/lib/lp/app/browser/doc/base-layout.rst
@@ -157,7 +157,7 @@ Page Footers
Take the tour http://launchpad.test/+tour
Read the guide https://help.launchpad.net/
Canonical Ltd. http://canonical.com/
- Terms of use http://launchpad.test/legal
+ Terms of use https://ubuntu.com/legal/launchpad-terms-of-service
Data privacy https://www.ubuntu.com/legal/dataprivacy
Contact Launchpad Support /feedback
Blog http://blog.launchpad.net/
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 10dc50b..dc1c60f 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -286,7 +286,7 @@
© 2004
<a href="http://canonical.com/";>Canonical Ltd.</a>
•
- <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
+ <a href="https://ubuntu.com/legal/launchpad-terms-of-service";>Terms of use</a>
•
<a href="https://www.ubuntu.com/legal/dataprivacy";>Data privacy</a>
•
diff --git a/lib/lp/app/tour/api b/lib/lp/app/tour/api
index f29f728..dc445d2 100644
--- a/lib/lp/app/tour/api
+++ b/lib/lp/app/tour/api
@@ -129,7 +129,7 @@ We've even done the hard work for you: use our LGPL Python library — <a hr
<a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
index 3f31618..e817afd 100644
--- a/lib/lp/app/tour/branch-hosting-tracking
+++ b/lib/lp/app/tour/branch-hosting-tracking
@@ -125,9 +125,9 @@ All team members can commit to a centrally hosted branch, while anyone can still
<a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/lib/lp/app/tour/bugs b/lib/lp/app/tour/bugs
index 51f7044..b6247d0 100644
--- a/lib/lp/app/tour/bugs
+++ b/lib/lp/app/tour/bugs
@@ -132,7 +132,7 @@ And to help find low-hanging fruit, there’s a “Bugs fixed elsewhere&
<a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/community b/lib/lp/app/tour/community
index e83a5a2..3231b54 100644
--- a/lib/lp/app/tour/community
+++ b/lib/lp/app/tour/community
@@ -111,7 +111,7 @@ Launchpad also helps you organise the social structure of your community with a
<a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/community-support b/lib/lp/app/tour/community-support
index d695675..b274119 100644
--- a/lib/lp/app/tour/community-support
+++ b/lib/lp/app/tour/community-support
@@ -104,7 +104,7 @@
<a href="api" tabindex="5" accesskey="g">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/feature-tracking b/lib/lp/app/tour/feature-tracking
index 8e564d1..a6c241a 100644
--- a/lib/lp/app/tour/feature-tracking
+++ b/lib/lp/app/tour/feature-tracking
@@ -86,7 +86,7 @@
<a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
index d0ead68..9a1812f 100644
--- a/lib/lp/app/tour/index
+++ b/lib/lp/app/tour/index
@@ -172,7 +172,7 @@
<a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
index 6c1c1b6..9e7b59c 100644
--- a/lib/lp/app/tour/join-launchpad
+++ b/lib/lp/app/tour/join-launchpad
@@ -107,7 +107,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
<a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/ppa b/lib/lp/app/tour/ppa
index b1b6e7f..3563dc5 100644
--- a/lib/lp/app/tour/ppa
+++ b/lib/lp/app/tour/ppa
@@ -111,7 +111,7 @@
<a href="community-support" accesskey="g" tabindex="5">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/release-management b/lib/lp/app/tour/release-management
index 5bdfa59..2a5ae22 100644
--- a/lib/lp/app/tour/release-management
+++ b/lib/lp/app/tour/release-management
@@ -94,7 +94,7 @@ Launchpad calls these <em>series</em> and helps you to organise your work &mdash
<a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
diff --git a/lib/lp/app/tour/translation b/lib/lp/app/tour/translation
index 65261ad..dae59da 100644
--- a/lib/lp/app/tour/translation
+++ b/lib/lp/app/tour/translation
@@ -111,7 +111,7 @@
<a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004 Canonical Ltd. <a href="https://ubuntu.com/legal/launchpad-terms-of-service"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
