[wwwdocs,Java] Merge java/.htaccess into top level .htaccess and convert to https

[wwwdocs,Java] Merge java/.htaccess into top level .htaccess and convert to https

[Gerald Pfeifer]

2014-07-01  Gerald Pfeifer  <gerald@pfeifer.com>

	* .htaccess: Merge java/.htaccess into top level .htaccess
	and convert to https.

Committed.

Index: java/.htaccess
===================================================================
RCS file: java/.htaccess
diff -N java/.htaccess
--- java/.htaccess	4 May 2001 16:24:26 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-Redirect permanent /java/FAQ.html http://gcc.gnu.org/java/faq.html
-Redirect permanent /java/gcj.html http://gcc.gnu.org/java/index.html
-Redirect permanent /java/libgcj.html http://gcc.gnu.org/java/index.html
-Redirect permanent /java/about.html http://gcc.gnu.org/about.html
Index: .htaccess
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/.htaccess,v
retrieving revision 1.32
diff -u -r1.32 .htaccess
--- .htaccess	11 Jun 2014 17:45:32 -0000	1.32
+++ .htaccess	1 Jul 2014 11:15:26 -0000
@@ -42,6 +42,11 @@
 Redirect permanent /onlinedocs/g77_bugs.html	https://gcc.gnu.org/onlinedocs/g77/Trouble.html
 Redirect permanent /onlinedocs/g77/		https://gcc.gnu.org/onlinedocs/gcc-3.4.6/g77/
 
+Redirect permanent /java/FAQ.html		https://gcc.gnu.org/java/faq.html
+Redirect permanent /java/gcj.html		https://gcc.gnu.org/java/
+Redirect permanent /java/libgcj.html		https://gcc.gnu.org/java/
+Redirect permanent /java/about.html		https://gcc.gnu.org/about.html
+
 Redirect permanent /bugs.html			https://gcc.gnu.org/bugs/
 Redirect permanent /c9xstatus.html		https://gcc.gnu.org/c99status.html
 Redirect permanent /cvswrite.html		https://gcc.gnu.org/svnwrite.html