Merge lp:~yoboy-leguesh/ubuntu-fr-doc/nettoyage into lp:ubuntu-fr-doc

[YoBoY]

Plein de toutes petites retouches pour simplifier la vie des sysadmins.

=== modified file '.bzrignore'
--- .bzrignore	2011-02-18 15:35:48 +0000
+++ .bzrignore	2011-04-27 07:36:53 +0000
@@ -5,3 +5,6 @@
 templates
 toolbars
 doc.dev.*
+apc.php
+robots.txt
+./.htaccess

=== removed file '.htaccess'
--- .htaccess	2011-01-24 08:52:15 +0000
+++ .htaccess	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-## Enable this to restrict editing to logged in users only
-
-## You should disable Indexes and MultiViews either here or in the
-## global config. Symlinks maybe needed for URL rewriting.
-Options -Indexes -MultiViews +FollowSymLinks
-
-## make sure nobody gets the htaccess, README, COPYING or VERSION files
-<Files ~ "^([\._]ht|README$|VERSION$|COPYING$)">
-    Order allow,deny
-    Deny from all
-    Satisfy All
-</Files>
-
-## Uncomment these rules if you want to have nice URLs using
-## $conf['userewrite'] = 1 - not needed for rewrite mode 2
-RewriteEngine on
-#
-## Not all installations will require the following line.  If you do, 
-## change "/dokuwiki" to the path to your dokuwiki directory relative
-## to your document root.
-#RewriteBase /dokuwiki
-#
-## If you enable DokuWikis XML-RPC interface, you should consider to
-## restrict access to it over HTTPS only! Uncomment the following two
-## rules if your server setup allows HTTPS.
-RewriteCond %{HTTPS} !=on
-RewriteRule ^lib/exe/xmlrpc.php$      https://%{SERVER_NAME}%{REQUEST_URI} [L,R=301]
-#
-RewriteRule ^_media/(.*)              lib/exe/fetch.php?media=$1  [QSA,L]
-RewriteRule ^_detail/(.*)             lib/exe/detail.php?media=$1  [QSA,L]
-RewriteRule ^_export/([^/]+)/(.*)     doku.php?do=export_$1&id=$2  [QSA,L]
-RewriteRule ^$                        doku.php  [L]
-RewriteCond %{REQUEST_FILENAME}       !-f
-RewriteCond %{REQUEST_FILENAME}       !-d
-RewriteRule (.*)                      doku.php?id=$1  [QSA,L]
-RewriteRule ^index.php$               doku.php

=== modified file 'conf/local.php'
--- conf/local.php	2011-02-11 07:03:08 +0000
+++ conf/local.php	2011-04-27 07:36:53 +0000
@@ -53,6 +53,3 @@
 $conf['readdircache']                    = 120;     // 2 minutes de cache sur les acces disques
 $conf['plugin']['captcha']['mode']       = 'js';
 
-// Insertion des paramètres "protégés" propres au serveur de travail
-@include(DOKU_CONF.'local.protected.php');
-

=== added file 'favicon.ico'
Binary files favicon.ico	1970-01-01 00:00:00 +0000 and favicon.ico	2011-04-27 07:36:53 +0000 differ
=== removed file 'robots.txt'
--- robots.txt	2011-01-23 17:10:06 +0000
+++ robots.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-User-Agent: *
-Disallow: /

=== added file 'robots.txt.dist'
--- robots.txt.dist	1970-01-01 00:00:00 +0000
+++ robots.txt.dist	2011-04-27 07:36:53 +0000
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: /