www .htaccess philosophy/.symlinks

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       14/06/04 12:25:14

Modified files:
        .              : .htaccess 
        philosophy     : .symlinks 

Log message:
        Add symlinks to proprietary/.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/.htaccess?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/.symlinks?cvsroot=www&r1=1.47&r2=1.48

Patches:
Index: .htaccess
===================================================================
RCS file: /web/www/www/.htaccess,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- .htaccess   4 Jun 2014 08:12:37 -0000       1.33
+++ .htaccess   4 Jun 2014 12:25:13 -0000       1.34
@@ -3,21 +3,6 @@
 # Expand SSI directives in .translist files
 AddOutputFilter INCLUDES .translist
 
-# Redirect malware*.html and proprietary*.html from /philosophy/ to 
/philosophy/proprietary/ (RT#914790).
-
-RedirectPermanent /philosophy/malware-apple.html 
http://www.gnu.org/philosophy/proprietary/malware-apple.html
-RedirectPermanent /philosophy/malware-kindle-swindle.html 
http://www.gnu.org/philosophy/proprietary/malware-kindle-swindle.html
-RedirectPermanent /philosophy/malware-microsoft.html 
http://www.gnu.org/philosophy/proprietary/malware-microsoft.html
-RedirectPermanent /philosophy/malware-mobiles.html 
http://www.gnu.org/philosophy/proprietary/malware-mobiles.html
-RedirectPermanent /philosophy/proprietary.html 
http://www.gnu.org/philosophy/proprietary/proprietary.html
-RedirectPermanent /philosophy/proprietary-back-doors.html 
http://www.gnu.org/philosophy/proprietary/proprietary-back-doors.html
-RedirectPermanent /philosophy/proprietary-drm.html 
http://www.gnu.org/philosophy/proprietary/proprietary-drm.html
-RedirectPermanent /philosophy/proprietary-insecurity.html 
http://www.gnu.org/philosophy/proprietary/proprietary-insecurity.html
-RedirectPermanent /philosophy/proprietary-jails.html 
http://www.gnu.org/philosophy/proprietary/proprietary-jails.html
-RedirectPermanent /philosophy/proprietary-sabotage.html 
http://www.gnu.org/philosophy/proprietary/proprietary-sabotage.html
-RedirectPermanent /philosophy/proprietary-surveillance.html 
http://www.gnu.org/philosophy/proprietary/proprietary-surveillance.html
-RedirectPermanent /philosophy/proprietary-tyrants.html 
http://www.gnu.org/philosophy/proprietary/proprietary-tyrants.html
-
 RedirectPermanent /private/index.html http://www.gnu.org/home.html
 
 # Redirect the old /philsophy/schools.html article to the new home

Index: philosophy/.symlinks
===================================================================
RCS file: /web/www/www/philosophy/.symlinks,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/.symlinks        23 Sep 2013 20:44:07 -0000      1.47
+++ philosophy/.symlinks        4 Jun 2014 12:25:14 -0000       1.48
@@ -28,3 +28,16 @@
 is-ever-good-use-nonfree-program.html is-it-ever-a-good-thing.html
 # Per RT #858455 proprietary-spyware.html symlinks to 
proprietary-surveillance.html -musial
 proprietary-surveillance.html proprietary-spyware.html
+# Redirect from old URLs RT #914790.
+malware-apple.html proprietary/malware-apple.html
+malware-kindle-swindle.html proprietary/malware-kindle-swindle.html
+malware-microsoft.html proprietary/malware-microsoft.html
+malware-mobiles.html proprietary/malware-mobiles.html
+proprietary.html proprietary/proprietary.html
+proprietary-back-doors.html proprietary/proprietary-back-doors.html
+proprietary-drm.html proprietary/proprietary-drm.html
+proprietary-insecurity.html proprietary/proprietary-insecurity.html
+proprietary-jails.html proprietary/proprietary-jails.html
+proprietary-sabotage.html proprietary/proprietary-sabotage.html
+proprietary-surveillance.html proprietary/proprietary-surveillance.html
+proprietary-tyrants.html proprietary/proprietary-tyrants.html