clean-up/improve FAQ redirects

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]