From 45f7622630b53847f25cd425bb381a34305c8cd4 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 30 Jul 2006 21:46:02 +0000
Subject: [PATCH] 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
---
 htdocs.net/.htaccess                                 |   9 ---------
 htdocs.net/css                                       |   1 -
 htdocs.net/images/favicon.png                        | Bin 836 -> 0 bytes
 htdocs.net/images/icons                              |   1 -
 htdocs.net/images/x.png                              |   1 -
 htdocs.net/javascript                                |   1 -
 htdocs.net/uploads                                   |   1 -
 htdocs.net/wiki                                      |   1 -
 {htdocs.net => htdocs}/images/asso-montants.png      | Bin
 {htdocs.net => htdocs}/images/asso.png               | Bin
 {htdocs.net => htdocs}/images/bandeau.jpg            | Bin
 {htdocs.net => htdocs}/images/barre.png              | Bin
 {htdocs.net => htdocs}/images/barre_small.png        | Bin
 {htdocs.net => htdocs}/images/carre.jpg              | Bin
 {htdocs.net => htdocs}/images/dflt_carre.jpg         | Bin
 {htdocs.net => htdocs}/images/fin_logo.jpg           | Bin
 {htdocs.net => htdocs}/images/logo-xorg.png          | Bin
 {htdocs.net => htdocs}/images/logo_binets.png        | Bin
 {htdocs.net => htdocs}/images/logo_evenements.png    | Bin
 {htdocs.net => htdocs}/images/logo_groupesx.png      | Bin
 {htdocs.net => htdocs}/images/logo_institutions.png  | Bin
 {htdocs.net => htdocs}/images/logo_plan.png          | Bin
 {htdocs.net => htdocs}/images/logo_promotions.png    | Bin
 {htdocs.net => htdocs}/images/logo_recherche.png     | Bin
 {htdocs.net => htdocs}/images/oval.png               | Bin
 {htdocs.net => htdocs}/images/oval2.png              | Bin
 {htdocs.net => htdocs}/images/parfait.jpg            | Bin
 {htdocs.net => htdocs}/images/puce.png               | Bin
 {htdocs.net => htdocs}/images/texte_binets.jpg       | Bin
 {htdocs.net => htdocs}/images/texte_evenements.jpg   | Bin
 {htdocs.net => htdocs}/images/texte_groupesx.jpg     | Bin
 {htdocs.net => htdocs}/images/texte_institutions.jpg | Bin
 {htdocs.net => htdocs}/images/texte_plan.jpg         | Bin
 {htdocs.net => htdocs}/images/texte_promotions.jpg   | Bin
 {htdocs.net => htdocs}/images/texte_recherche.jpg    | Bin
 {htdocs.net => htdocs}/xnet.php                      |   0
 36 files changed, 15 deletions(-)
 delete mode 100644 htdocs.net/.htaccess
 delete mode 120000 htdocs.net/css
 delete mode 100644 htdocs.net/images/favicon.png
 delete mode 120000 htdocs.net/images/icons
 delete mode 120000 htdocs.net/images/x.png
 delete mode 120000 htdocs.net/javascript
 delete mode 120000 htdocs.net/uploads
 delete mode 120000 htdocs.net/wiki
 rename {htdocs.net => htdocs}/images/asso-montants.png (100%)
 rename {htdocs.net => htdocs}/images/asso.png (100%)
 rename {htdocs.net => htdocs}/images/bandeau.jpg (100%)
 rename {htdocs.net => htdocs}/images/barre.png (100%)
 rename {htdocs.net => htdocs}/images/barre_small.png (100%)
 rename {htdocs.net => htdocs}/images/carre.jpg (100%)
 rename {htdocs.net => htdocs}/images/dflt_carre.jpg (100%)
 rename {htdocs.net => htdocs}/images/fin_logo.jpg (100%)
 rename {htdocs.net => htdocs}/images/logo-xorg.png (100%)
 rename {htdocs.net => htdocs}/images/logo_binets.png (100%)
 rename {htdocs.net => htdocs}/images/logo_evenements.png (100%)
 rename {htdocs.net => htdocs}/images/logo_groupesx.png (100%)
 rename {htdocs.net => htdocs}/images/logo_institutions.png (100%)
 rename {htdocs.net => htdocs}/images/logo_plan.png (100%)
 rename {htdocs.net => htdocs}/images/logo_promotions.png (100%)
 rename {htdocs.net => htdocs}/images/logo_recherche.png (100%)
 rename {htdocs.net => htdocs}/images/oval.png (100%)
 rename {htdocs.net => htdocs}/images/oval2.png (100%)
 rename {htdocs.net => htdocs}/images/parfait.jpg (100%)
 rename {htdocs.net => htdocs}/images/puce.png (100%)
 rename {htdocs.net => htdocs}/images/texte_binets.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_evenements.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_groupesx.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_institutions.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_plan.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_promotions.jpg (100%)
 rename {htdocs.net => htdocs}/images/texte_recherche.jpg (100%)
 rename {htdocs.net => htdocs}/xnet.php (100%)

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 0e4b1d1c6fcb88c7ef089c0ec72f60cc73c18a8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(hL#<051hq=8*sZ0?|oC
zK~#90b&^|bi(wqb|NrlOzn+Xr*HuewOgH8*E}RK5wnd1;8d<q;jszhggb)$Qgor!b
z2oYmJFsGPVWD%yb?qG~1*2$`N?2hKs_G{mR3*tiJxp;1V&+qQRf}#@me-O|>Ra6wt
zBokZ$SN<|7CF3lr$FxX9izKwDKJZ;5X8Y`U^P8UD%$_?>#57f*^zS;N>m$sL)bz0_
zW1P|9SZ7Z+HLKqBbB^RK*tlcAW%yfHLq*0i?;jz~5~FOc?cSAD#TRStJX^ec#kMWG
zt)oqQJO%G+-!}NG5%KE#NM(7s0svA9!RXAaDVO$aJbiRuBHVWDz`@Bjvs1y+2M?r_
z=dPD7%v;~y5z<+l0)UXhpqN}~t``q)4@g-(2q%)jtwIz)1Mv62k*%J4U&Q@;WkL#)
zmE+-Dnv<*)V-ggcwz{{Y|6^eI{I!a@maub_BX@$~?uY(YwT;10yUD0f0Ej2VIJ>>_
z#-;qiy`8?tr*^K*o-ynFhj#%EnG~;-)injftzSBllkHUM3MDFI=yE!O^{=htGvdzd
zHYwMw&9mE`nG}6r`@Ru-m9KuR!)E1OMm9u8D(uYJ%@%+&-97E$-tbU=5=;=p#JC^;
z(^8X*-*o9(1PKPKD}FFS+naooa1#K$2=uw#$^O?`3SwGn+R$LQvL$RqtR9drU5<{<
zuH567Lyfg~>W;75|K!l&1L<Q@5D@?#`vX7h?uU<FPR*J)E*{#oX372Ml?l_x8^w21
zrY}-jL)}xoM_1)6N5qpCt~E>fsx5l+YDu`WwWi9~Z<$o~xzCfI<6Syu<%UAe1r`+D
zvN=<2_%q*=>#O-%_qI`s3|Y)T2uUy|xzU}Ov0(0OqC#!`r(mEN3yMk@GazyySWM>z
zqfjYTPyql5l5?RaxD*69S5#>+87Tlz8V3MEP*v$a-=>66LI42Zcf&7NY*jB+qP`3O
O0000<MNUMnLSTXn5Q!K7

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
-- 
2.1.4