r22689 - htdocs/branches/beta - Merge branch 'trunk' into beta

Thu Jan 10 18:39:10 EST 2013

Author: jralls
Date: 2013-01-10 18:39:10 -0500 (Thu, 10 Jan 2013)
New Revision: 22689
Trac: http://svn.gnucash.org/trac/changeset/22689

Added:
   htdocs/branches/beta/docs/v1.6/de_DE/image
   htdocs/branches/beta/docs/v1.6/es/image
   htdocs/branches/beta/docs/v1.6/pt_PT/image
Modified:
   htdocs/branches/beta/.htaccess
   htdocs/branches/beta/robots.txt
Log:
Merge branch 'trunk' into beta

Modified: htdocs/branches/beta/.htaccess
===================================================================

--- htdocs/branches/beta/.htaccess	2013-01-01 00:10:07 UTC (rev 22688)
+++ htdocs/branches/beta/.htaccess	2013-01-10 23:39:10 UTC (rev 22689)
@@ -1,4 +1,3 @@
-DirectoryIndex index.phtml index.php index.html
 AddType application/x-httpd-php .phtml
 
 # Over time, files got moved around in the webdirectory
@@ -12,12 +11,58 @@
 # The old website was kept here for historical purposes.
 # Any attempt to access it will be redirected to the
 # new site's main page.
+<<<<<<< HEAD
 RedirectMatch permanent /old-website/* http://www.gnucash.org
+=======
+RedirectMatch permanent /old-website/.* http://www.gnucash.org
+>>>>>>> trunk
 
 # Images were once stored in /externals, while they are now in /images
 # Redirect some that get a lot of "not found hits"
 Redirect permanent /externals/banner5.png /images/banner5.png
+Redirect permanent /externals/webding.png /images/webding.png
 
+# Other images have been replaced meanwhile
+Redirect permanent /images/icons/feed-icon-12x12.png /images/gc-rss.png
+
+# The french version of the website apparently used to have
+# lots of private pages. Not all of them have an equivalent
+# on the current site anymore. We'll just redirect them
+# as well as we can to sensible alternatives.
+Redirect permanent /fr/bios             /index.phtml?lang=fr_FR
+Redirect permanent /fr/components       /index.phtml?lang=fr_FR
+Redirect permanent /fr/contribute       http://wiki.gnucash.org/wiki/Development
+Redirect permanent /fr/data             /index.phtml?lang=fr_FR
+Redirect permanent /fr/Docs             /docs.phtml?lang=fr_FR
+Redirect permanent /fr/features_5.phtml /features.phtml?lang=fr_FR
+Redirect permanent /fr/irc.phtml        http://wiki.gnucash.org/wiki/IRC
+Redirect permanent /fr/links            /index.phtml?lang=fr_FR
+Redirect permanent /fr/menu             /index.phtml?lang=fr_FR
+
+# Some pages that don't exist anymore in the current website
+RedirectMatch permanent /.*/favicon.ico        /favicon.ico
+RedirectMatch permanent /.*/lists.phtml        http://wiki.gnucash.org/wiki/Mailing_Lists
+RedirectMatch permanent /(.*)/promote.phtml    /index.phtml?lang=$1
+RedirectMatch permanent /(.*)/required.phtml   /index.phtml?lang=$1
+RedirectMatch permanent /.*/roadmap.phtml      http://wiki.gnucash.org/wiki/Roadmap
+RedirectMatch permanent /(.*)/rss-feed.phtml   /atom.php?lang=$1
+RedirectMatch permanent /(.*)/state_of_the_gnucash_project.phtml   /sizing.phtml?lang=$1
+RedirectMatch permanent /.*/sql.phtml          http://wiki.gnucash.org/wiki/SQL
+RedirectMatch permanent /(.*)/t-shirt          /index.phtml?lang=$1
+
 # Non-English versions of the site used to be accessed via
 # a language path specifier. This now uses a get variable.
-RedirectMatch permanent /nl/(.*)  /$1?lang=nl_NL
+RedirectMatch permanent /de/(.*)     /$1?lang=de_DE
+RedirectMatch permanent /es/(.*)     /$1?lang=es_ES
+RedirectMatch permanent /en/(.*)     /$1?lang=en_US
+RedirectMatch permanent /fr/(.*)     /$1?lang=fr_FR
+RedirectMatch permanent /hu/(.*)     /$1?lang=hu_HU
+RedirectMatch permanent /it/(.*)     /$1?lang=it_IT
+RedirectMatch permanent /ja/(.*)     /$1?lang=ja_JP
+RedirectMatch permanent /nb/(.*)     /$1?lang=nb_NB
+RedirectMatch permanent /nl/(.*)     /$1?lang=nl_NL
+RedirectMatch permanent /pl/(.*)     /$1?lang=pl_PL
+RedirectMatch permanent /pt_PT/(.*)  /$1?lang=pt_PT
+RedirectMatch permanent /zh_CN/(.*)  /$1?lang=zh_CN
+RedirectMatch permanent /zh_TW/(.*)  /$1?lang=zh_TW
+

Added: htdocs/branches/beta/docs/v1.6/de_DE/image
===================================================================
--- htdocs/branches/beta/docs/v1.6/de_DE/image	                        (rev 0)
+++ htdocs/branches/beta/docs/v1.6/de_DE/image	2013-01-10 23:39:10 UTC (rev 22689)
@@ -0,0 +1 @@
+link ../C/image
\ No newline at end of file


Property changes on: htdocs/branches/beta/docs/v1.6/de_DE/image
___________________________________________________________________
Added: svn:special
   + *

Added: htdocs/branches/beta/docs/v1.6/es/image
===================================================================
--- htdocs/branches/beta/docs/v1.6/es/image	                        (rev 0)
+++ htdocs/branches/beta/docs/v1.6/es/image	2013-01-10 23:39:10 UTC (rev 22689)
@@ -0,0 +1 @@
+link ../C/image
\ No newline at end of file


Property changes on: htdocs/branches/beta/docs/v1.6/es/image
___________________________________________________________________
Added: svn:special
   + *

Added: htdocs/branches/beta/docs/v1.6/pt_PT/image
===================================================================
--- htdocs/branches/beta/docs/v1.6/pt_PT/image	                        (rev 0)
+++ htdocs/branches/beta/docs/v1.6/pt_PT/image	2013-01-10 23:39:10 UTC (rev 22689)
@@ -0,0 +1 @@
+link ../C/image
\ No newline at end of file


Property changes on: htdocs/branches/beta/docs/v1.6/pt_PT/image
___________________________________________________________________
Added: svn:special
   + *

Modified: htdocs/branches/beta/robots.txt
===================================================================
--- htdocs/branches/beta/robots.txt	2013-01-01 00:10:07 UTC (rev 22688)
+++ htdocs/branches/beta/robots.txt	2013-01-10 23:39:10 UTC (rev 22689)
@@ -23,3 +23,7 @@
 Disallow: /docs/v1.8/
 Disallow: /docs/v2.0/
 Disallow: /docs/v2.2/
+
+# Keep robots away from the beta site
+
+Disallow: /beta/

