Merge branch 'master' into cc4-ro-legalcode

Author: TimidRobot

config/creativecommons.org.conf

@@ -135,7 +135,8 @@
 
     Redirect permanent /remix /use-remix/ideas
     #Redirect permanent /about/store https://store.creativecommons.org/
-    Redirect permanent /about/faq /faq
+    Redirect permanent /FAQ         /faq
+    Redirect permanent /about/faq   /faq
 
     Redirect permanent /participate /about/get-involved
     #Redirect permanent /store https://store.creativecommons.org/
@@ -513,7 +514,6 @@
     RewriteRule ^/audio/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_audio_page [L,NE,R=301]
     RewriteRule ^/education/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_existing_website_2 [L,NE,R=301]
     RewriteRule ^.*/embedding$ http://wiki.creativecommons.org/Embedded_Metadata [L,R=301]
-    #RewriteRule ^/faq.*$ http://wiki.creativecommons.org/FAQ [L,R=301]
     RewriteRule ^/image/publish-buzznet http://wiki.creativecommons.org/HOWTO_Publish#Buzznet [L,NE,R=301]
     RewriteRule ^/image/publish-flickr http://wiki.creativecommons.org/HOWTO_Publish#Flickr [L,NE,R=301]
     RewriteRule ^/image/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_photo_pages [L,NE,R=301]

docroot/legalcode/by-nc-nd_4.0.html

@@ -376,7 +376,7 @@ <h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International P
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Please read the <a href="/FAQ#officialtranslations">FAQ</a> for more information about official translations.</p>
+ Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</p>
 </div>
 
         </div>

docroot/legalcode/by-nc-nd_4.0_ar.html

@@ -336,7 +336,7 @@ <h3>مؤسسة المشاع الإبداعي نَسْبُ الـمُصنَّف،
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
-<br> يرجى قراءة <a href="/FAQ#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
+<br> يرجى قراءة <a href="/faq/#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
 </div>
 </div>
 <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_cs.html

@@ -335,7 +335,7 @@ <h3>Creative Commons Uveďte původ-Neužívejte komerčně-Nezpracovávejte 4.0
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Pro další informace ohledně oficiálních překladů si prosím přečtěte <a href="/FAQ#officialtranslations">FAQ</a>.
+ Pro další informace ohledně oficiálních překladů si prosím přečtěte <a href="/faq/#officialtranslations">FAQ</a>.
 </div>
 </div>
 <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_de.html

@@ -335,7 +335,7 @@ <h3>Creative Commons Namensnennung-Nicht kommerziell-Keine Bearbeitungen 4.0 Int
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Bitte lesen Sie die <a href="/FAQ#officialtranslations">FAQ</a> für eingehendere Informationen zu offiziellen Übersetzungen.</p>
+ Bitte lesen Sie die <a href="/faq/#officialtranslations">FAQ</a> für eingehendere Informationen zu offiziellen Übersetzungen.</p>
 </div>
 </div>
 <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_el.html

@@ -674,8 +674,7 @@ <h3>Creative Commons Αναφορά-Μη Εμπορική Χρήση-Όχι Πα
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
 
-Παρακαλώ διαβάστε το <a href=
-"/FAQ#officialtranslations">FAQ</a> για
+Παρακαλώ διαβάστε το <a href="/faq/#officialtranslations">FAQ</a> για
 περαιτέρω πληροφορίες σχετικά με τις επίσημες μεταφράσεις.</p>
 </div>
 </div>

docroot/legalcode/by-nc-nd_4.0_es.html

@@ -334,7 +334,7 @@ <h3>Creative Commons Atribución/Reconocimiento-NoComercial-SinDerivados 4.0 Lic
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Por favor lea las <a href="/FAQ#officialtranslations">Preguntas Frecuentes</a> para obtener más información acerca de las traducciones oficiales.</p>
+ Por favor lea las <a href="/faq/#officialtranslations">Preguntas Frecuentes</a> para obtener más información acerca de las traducciones oficiales.</p>
 </div>
 </div>
 <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_eu.html

@@ -338,7 +338,7 @@ <h3>Creative Commons Aitortu-EzKomertziala-LanEratorririkGabe 4.0 Nazioartekoa L
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
 
-Irakurri <a href="/FAQ#officialtranslations">FAQ</a> atala itzulpen ofizialen inguruko informazio gehiago izateko.
+Irakurri <a href="/faq/#officialtranslations">FAQ</a> atala itzulpen ofizialen inguruko informazio gehiago izateko.
 </div>
 </div>
 <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_fi.html

@@ -384,7 +384,7 @@ <h3>Creative Commons Nimeä-EiKaupallinen-EiMuutoksia 4.0 Kansainvälinen Julkin
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Lisätietoa virallisista käännöksistä <a href="/FAQ#officialtranslations">FAQ</a>-sivulla.</p>
+ Lisätietoa virallisista käännöksistä <a href="/faq/#officialtranslations">FAQ</a>-sivulla.</p>
 </div>
         </div>
         <div id="deed-foot">

docroot/legalcode/by-nc-nd_4.0_fr.html

@@ -381,7 +381,7 @@ <h3>Licence publique Creative Commons Attribution - Utilisation non commerciale
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
 <a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
 <!-- Language Footer End - DO NOT DELETE -->
- Veuillez lire la <a href="/FAQ#officialtranslations">FAQ</a> pour plus d'informations sur les traductions officielles.
+ Veuillez lire la <a href="/faq/#officialtranslations">FAQ</a> pour plus d'informations sur les traductions officielles.
                 </p>
 </div>
         </div>