From: x2000habouzit Date: Sun, 30 Jul 2006 21:46:02 +0000 (+0000) Subject: trick apache round #2: merge htdocs.net into htdocs. X-Git-Tag: xorg/0.9.11~177 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=45f7622630b53847f25cd425bb381a34305c8cd4;p=platal.git trick apache round #2: merge htdocs.net into htdocs. oh yeah git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@737 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/htdocs.net/.htaccess b/htdocs.net/.htaccess deleted file mode 100644 index 3753de7..0000000 --- a/htdocs.net/.htaccess +++ /dev/null @@ -1,9 +0,0 @@ -Options +FollowSymLinks -RewriteEngine on - -RewriteBase /~x2000habouzit - -# Rewrite URLs of the form 'index.php?q=x': -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^(.*)$ ?n=$1 [L,QSA] diff --git a/htdocs.net/css b/htdocs.net/css deleted file mode 120000 index 751b784..0000000 --- a/htdocs.net/css +++ /dev/null @@ -1 +0,0 @@ -../htdocs/css \ No newline at end of file diff --git a/htdocs.net/images/favicon.png b/htdocs.net/images/favicon.png deleted file mode 100644 index 0e4b1d1..0000000 Binary files a/htdocs.net/images/favicon.png and /dev/null differ diff --git a/htdocs.net/images/icons b/htdocs.net/images/icons deleted file mode 120000 index 1800b20..0000000 --- a/htdocs.net/images/icons +++ /dev/null @@ -1 +0,0 @@ -../../htdocs/images/icons \ No newline at end of file diff --git a/htdocs.net/images/x.png b/htdocs.net/images/x.png deleted file mode 120000 index 109e80e..0000000 --- a/htdocs.net/images/x.png +++ /dev/null @@ -1 +0,0 @@ -../../htdocs/images/x.png \ No newline at end of file diff --git a/htdocs.net/javascript b/htdocs.net/javascript deleted file mode 120000 index 5f62f31..0000000 --- a/htdocs.net/javascript +++ /dev/null @@ -1 +0,0 @@ -../htdocs/javascript \ No newline at end of file diff --git a/htdocs.net/uploads b/htdocs.net/uploads deleted file mode 120000 index e724cd0..0000000 --- a/htdocs.net/uploads +++ /dev/null @@ -1 +0,0 @@ -../spool/uploads/ \ No newline at end of file diff --git a/htdocs.net/wiki b/htdocs.net/wiki deleted file mode 120000 index aea38f9..0000000 --- a/htdocs.net/wiki +++ /dev/null @@ -1 +0,0 @@ -../wiki/pub/ \ No newline at end of file diff --git a/htdocs.net/images/asso-montants.png b/htdocs/images/asso-montants.png similarity index 100% rename from htdocs.net/images/asso-montants.png rename to htdocs/images/asso-montants.png diff --git a/htdocs.net/images/asso.png b/htdocs/images/asso.png similarity index 100% rename from htdocs.net/images/asso.png rename to htdocs/images/asso.png diff --git a/htdocs.net/images/bandeau.jpg b/htdocs/images/bandeau.jpg similarity index 100% rename from htdocs.net/images/bandeau.jpg rename to htdocs/images/bandeau.jpg diff --git a/htdocs.net/images/barre.png b/htdocs/images/barre.png similarity index 100% rename from htdocs.net/images/barre.png rename to htdocs/images/barre.png diff --git a/htdocs.net/images/barre_small.png b/htdocs/images/barre_small.png similarity index 100% rename from htdocs.net/images/barre_small.png rename to htdocs/images/barre_small.png diff --git a/htdocs.net/images/carre.jpg b/htdocs/images/carre.jpg similarity index 100% rename from htdocs.net/images/carre.jpg rename to htdocs/images/carre.jpg diff --git a/htdocs.net/images/dflt_carre.jpg b/htdocs/images/dflt_carre.jpg similarity index 100% rename from htdocs.net/images/dflt_carre.jpg rename to htdocs/images/dflt_carre.jpg diff --git a/htdocs.net/images/fin_logo.jpg b/htdocs/images/fin_logo.jpg similarity index 100% rename from htdocs.net/images/fin_logo.jpg rename to htdocs/images/fin_logo.jpg diff --git a/htdocs.net/images/logo-xorg.png b/htdocs/images/logo-xorg.png similarity index 100% rename from htdocs.net/images/logo-xorg.png rename to htdocs/images/logo-xorg.png diff --git a/htdocs.net/images/logo_binets.png b/htdocs/images/logo_binets.png similarity index 100% rename from htdocs.net/images/logo_binets.png rename to htdocs/images/logo_binets.png diff --git a/htdocs.net/images/logo_evenements.png b/htdocs/images/logo_evenements.png similarity index 100% rename from htdocs.net/images/logo_evenements.png rename to htdocs/images/logo_evenements.png diff --git a/htdocs.net/images/logo_groupesx.png b/htdocs/images/logo_groupesx.png similarity index 100% rename from htdocs.net/images/logo_groupesx.png rename to htdocs/images/logo_groupesx.png diff --git a/htdocs.net/images/logo_institutions.png b/htdocs/images/logo_institutions.png similarity index 100% rename from htdocs.net/images/logo_institutions.png rename to htdocs/images/logo_institutions.png diff --git a/htdocs.net/images/logo_plan.png b/htdocs/images/logo_plan.png similarity index 100% rename from htdocs.net/images/logo_plan.png rename to htdocs/images/logo_plan.png diff --git a/htdocs.net/images/logo_promotions.png b/htdocs/images/logo_promotions.png similarity index 100% rename from htdocs.net/images/logo_promotions.png rename to htdocs/images/logo_promotions.png diff --git a/htdocs.net/images/logo_recherche.png b/htdocs/images/logo_recherche.png similarity index 100% rename from htdocs.net/images/logo_recherche.png rename to htdocs/images/logo_recherche.png diff --git a/htdocs.net/images/oval.png b/htdocs/images/oval.png similarity index 100% rename from htdocs.net/images/oval.png rename to htdocs/images/oval.png diff --git a/htdocs.net/images/oval2.png b/htdocs/images/oval2.png similarity index 100% rename from htdocs.net/images/oval2.png rename to htdocs/images/oval2.png diff --git a/htdocs.net/images/parfait.jpg b/htdocs/images/parfait.jpg similarity index 100% rename from htdocs.net/images/parfait.jpg rename to htdocs/images/parfait.jpg diff --git a/htdocs.net/images/puce.png b/htdocs/images/puce.png similarity index 100% rename from htdocs.net/images/puce.png rename to htdocs/images/puce.png diff --git a/htdocs.net/images/texte_binets.jpg b/htdocs/images/texte_binets.jpg similarity index 100% rename from htdocs.net/images/texte_binets.jpg rename to htdocs/images/texte_binets.jpg diff --git a/htdocs.net/images/texte_evenements.jpg b/htdocs/images/texte_evenements.jpg similarity index 100% rename from htdocs.net/images/texte_evenements.jpg rename to htdocs/images/texte_evenements.jpg diff --git a/htdocs.net/images/texte_groupesx.jpg b/htdocs/images/texte_groupesx.jpg similarity index 100% rename from htdocs.net/images/texte_groupesx.jpg rename to htdocs/images/texte_groupesx.jpg diff --git a/htdocs.net/images/texte_institutions.jpg b/htdocs/images/texte_institutions.jpg similarity index 100% rename from htdocs.net/images/texte_institutions.jpg rename to htdocs/images/texte_institutions.jpg diff --git a/htdocs.net/images/texte_plan.jpg b/htdocs/images/texte_plan.jpg similarity index 100% rename from htdocs.net/images/texte_plan.jpg rename to htdocs/images/texte_plan.jpg diff --git a/htdocs.net/images/texte_promotions.jpg b/htdocs/images/texte_promotions.jpg similarity index 100% rename from htdocs.net/images/texte_promotions.jpg rename to htdocs/images/texte_promotions.jpg diff --git a/htdocs.net/images/texte_recherche.jpg b/htdocs/images/texte_recherche.jpg similarity index 100% rename from htdocs.net/images/texte_recherche.jpg rename to htdocs/images/texte_recherche.jpg diff --git a/htdocs.net/xnet.php b/htdocs/xnet.php similarity index 100% rename from htdocs.net/xnet.php rename to htdocs/xnet.php