com web/doc: Goodbye, old howto!: cron/weekly/howto www/.htaccess

Commit:    8e35e76829b7d4f7891733148bf0ab69bb20f2d7
Author:    Sobak <[email protected]>         Fri, 20 Jun 2014 15:26:38 +0200
Parents:   623fd3f22f02e276eeaa50b380129af18429c51e
Branches:  master

Link:       http://git.php.net/?p=web/doc.git;a=commitdiff;h=8e35e76829b7d4f7891733148bf0ab69bb20f2d7

Log:
Goodbye, old howto!

Changed paths:
  D  cron/weekly/howto
  M  www/.htaccess


Diff:
diff --git a/cron/weekly/howto b/cron/weekly/howto
deleted file mode 100755
index 6968614..0000000
--- a/cron/weekly/howto
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. `dirname $0`/../../build-ops
-
-cd ${SVNDIR}/${DOCDIR}
-php doc-base/configure.php --enable-howto
-phd -d ${SVNDIR}/${DOCDIR}/doc-base/howto/.howto.xml --package PHP -f howto -o ${SVNDIR}/${DOCDIR}/
-# the generated path is wrong: 
-# http://git.php.net/?p=phd.git;a=blob;f=phpdotnet/phd/Package/PHP/HowTo.php;h=e06bfff451f4a947a41e493fc4f7252c21f130ca;hb=HEAD#l72
-# dochowto is under www/ while the include directory is on the same level as www, so it is two level above dochowto
-sed -i -e "s|../include/init.inc.php|${DOCWEB}/include/init.inc.php|g" php-howto/*.php
-mv -f php-howto/*.php ${DOCWEB}/www/dochowto/
-
-#make howtotgz
-#cp howto/howto.html.tar.gz ${DOCWEB}/www/dochowto
diff --git a/www/.htaccess b/www/.htaccess
index 7c0566d..f7e7d16 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -1,13 +1,11 @@
 RewriteEngine On
 
 # tutorial rewrites
+RewriteRule ^(((.+)/)+)?dochowto(/)?$ /$1tutorial/ [L,R=301]
 RewriteRule ^(((.+)/)+)?tutorial$ /$1tutorial/ [L,R=301]
 RewriteRule ^tutorial/$ /tutorial.php?chapter=intro [L]
 RewriteRule ^tutorial/([a-z\-]*).php$ /tutorial.php?chapter=$1 [L]
 
-# dochowto fix
-RewriteRule ^(((.+)/)+)?dochowto$ /$1dochowto/ [R=301]
-
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^(.*)$ /redirect.php