updated the license info at the footer.

The pages, images, videos and logos under /2014/ is now licensed under
Creative Commons Attribution-ShareAlike 3.0 US. Before it was licensed
under the Unported version of the same license.

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index e5a9c129c0d9985240272f90d1e17f27f5d87b65..f0018c64705120738fd26e5b7ecbf945a33b52b3 100644 (file)
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -150,7 +150,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/call_for_sessions/confirmation.html b/2014/call_for_sessions/confirmation.html
index 640486be16fc39182da14dfdb4da5393865ffe6b..02e1969ec50e4f0f49a17c512db78ddcf4ce46e0 100644 (file)
--- a/2014/call_for_sessions/confirmation.html
+++ b/2014/call_for_sessions/confirmation.html
@@ -139,7 +139,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/call_for_sessions/index.html b/2014/call_for_sessions/index.html
index 5006a4a5f80575f9da6d78ff833ad2784bb42fe8..e84a429199f5e55817a2c2a9bcb286ee525bd875 100644 (file)
--- a/2014/call_for_sessions/index.html
+++ b/2014/call_for_sessions/index.html
@@ -125,7 +125,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/exhibit/confirmation.html b/2014/exhibit/confirmation.html
index fc29fa69314f07421be6e98117320a9c5910c236..b60364fcc5de6be34547699dbca1e25badc78759 100644 (file)
--- a/2014/exhibit/confirmation.html
+++ b/2014/exhibit/confirmation.html
@@ -139,7 +139,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/exhibit/index.html b/2014/exhibit/index.html
index 16c9070fd03bac3ad19aed764934a752d9b0b186..0e3b98516ee5d25c9dd092af25e49168dacdf063 100644 (file)
--- a/2014/exhibit/index.html
+++ b/2014/exhibit/index.html
@@ -678,7 +678,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/volunteer/confirmation.html b/2014/volunteer/confirmation.html
index 809adbba34698cd0a90f84e941568c555f39cbe3..e2b37e962da2f1903247f3ea4d1726a8c9b5f7ca 100644 (file)
--- a/2014/volunteer/confirmation.html
+++ b/2014/volunteer/confirmation.html
@@ -139,7 +139,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/2014/volunteer/index.html b/2014/volunteer/index.html
index 97e22e8e0c8875c3857a7f54774eb3df24e3e3c3..726f745cf85e5673dd4d2f67299a693efdbf9001 100644 (file)
--- a/2014/volunteer/index.html
+++ b/2014/volunteer/index.html
@@ -601,7 +601,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">

diff --git a/server/staging/lpc14/index.html b/server/staging/lpc14/index.html
index cc202a17e0e8947ce6edec7109bcf12ffc32ca41..0067f151247f6bc3278fcc596e7e9a6a56c6c75b 100644 (file)
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@ -188,7 +188,19 @@
                  Foundation</a> is a nonprofit with a worldwide mission to
                  advance software freedom.</p>
 
-                 <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
+               <p class="text-muted text-center">
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       <img alt="[ Creative Commons License ]" style="border-width:0"
+                                src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+                 </a>
+                 This page and its images, logos and videos are licensed under a <br />
+                 <a rel="license"
+                        href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+                       Creative Commons Attribution-ShareAlike 3.0 US
+                 </a>.
+                 Copyright &copy; 2013 Free Software Foundation.
+               </p>
 
                <p class="text-muted text-center">
                  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">