diff --git a/.gitattributes b/.gitattributes
index 4d72aa8..fe7ea2f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,4 @@
 *.png filter=media -crlf
 *.tiff filter=media -crlf
 *.ogv filter=media -crlf
+*.tar.xz filter=media -crlf
diff --git a/audio-tar.gz b/audio-tar.gz
deleted file mode 100644
index e76de06..0000000
Binary files a/audio-tar.gz and /dev/null differ
diff --git a/wiki/audio.tar.xz b/wiki/audio.tar.xz
new file mode 100644
index 0000000..61d0991
--- /dev/null
+++ b/wiki/audio.tar.xz
@@ -0,0 +1 @@
+63d7c7cf736338a0a49266071a5040cc8d0c18b8
diff --git a/wiki/hora.mdwn b/wiki/hora.mdwn
index 86ff236..844b09d 100644
--- a/wiki/hora.mdwn
+++ b/wiki/hora.mdwn
@@ -20,8 +20,8 @@ Ojo, eso es el codigo del plugin. No incluye los audios de reproduccion. Recomen
 
 
     cd hora
-    wget http://yaxhil.flujos.org/wiki/audio-tar.gz
-    tar xvvzf audio-tar.gz
+    wget http://yaxhil.flujos.org/wiki/audio.tar.xz
+    tar xvvJf audio.tar.xz
 
 ## como instalar plugin de rhythmbox
  

diff --git a/sidebar.mdwn b/sidebar.mdwn
index 29a9e80..8172c59 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,5 +1,5 @@
 [[!img images/nuestrosmedios.jpg size="150x100" alt="logo"]]
-[[!audio http://radio.flujos.org:8000/rockola.oga text="Escucha"]]
+[[!audio http://radio.flujos.org:8000/yaxhilradio.oga text="Escucha"]]
 * [[Inicio|http://yaxhil.flujos.org]]
 * [[Contacto|contacto]]
 * [[Imágenes|images]] 

diff --git a/contacto.mdwn b/contacto.mdwn
new file mode 100644
index 0000000..895c57f
--- /dev/null
+++ b/contacto.mdwn
@@ -0,0 +1,21 @@
+#Comunica con nosotros
+El dia 28 de diciembre del 2011 cumplimos
+3 años de estar al aire gracias al esfuerzo
+de los compañeros y compañeras ke participan
+dando su tiempo sin ningun pago.
+La radio cuenta con un comite que es nombrado
+en asamblea de ciudadanos.
+
+La Radio Comunitaria Yaxhil no pertenece
+a ningun partido politico, ni a ningun grupo
+o religion, y su funcionamiento es sin fines
+de lucro.
+
+SOMOS DIDZA LUBË (PALBRAS EN EL AIRE)
+Porque el aire es un bien natural, que no
+es de nadie, del cual hacemos uso para
+transmitir la palabra de los pueblos.
+
+**radioyaxhil (arroba) hotmail.com**
+
+
diff --git a/index.mdwn b/index.mdwn
index a621a95..0bc26b0 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,26 +9,10 @@
 104.5 FM didza lube 
 (palabras en el aire)
 
-[[!img images/aniversarios/panoramica.jpg size="400x224" class="right"]]
-ES UN ESFUERZO DEL PUEBLO DE
+[[!img images/aniversarios/panoramica.jpg size="520x291" class="left"]]
+Es un esfuerzo del pueblo de 
 SAN JUAN YAGILA, IXTLAN, OAXACA
-Y DE LOS PUEBLOS QUE ESCUCHAN LA RADIO.
-
-El dia 28 de diciembre del 2011 cumplimos
-3 años de estar al aire gracias al esfuerzo
-de los compañeros y compañeras ke participan
-dando su tiempo sin ningun pago.
-La radio cuenta con un comite que es nombrado
-en asamblea de ciudadanos.
-
-La Radio Comunitaria Yaxhil no pertenece
-a ningun partido politico, ni a ningun grupo
-o religion, y su funcionamiento es sin fines
-de lucro.
-
-SOMOS DIDZA LUBË (PALBRAS EN EL AIRE)
-Porque el aire es un bien natural, que no
-es de nadie, del cual hacemos uso para
-transmitir la palabra de los pueblos.
-
+y de los pueblos que escuchan la radio. 
+[[!img images/radio_comunitaria_yaxhil.jpg size="153x110" class="right"]]
+[[Comunica con nosotros|contacto]]. 
 
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 9891c18..29a9e80 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,6 +1,7 @@
 [[!img images/nuestrosmedios.jpg size="150x100" alt="logo"]]
 [[!audio http://radio.flujos.org:8000/rockola.oga text="Escucha"]]
 * [[Inicio|http://yaxhil.flujos.org]]
+* [[Contacto|contacto]]
 * [[Imágenes|images]] 
 * [[Audio]]
 * [[Hora plugin|wiki/hora]]

diff --git a/wiki/media.mdwn b/wiki/media.mdwn
index d1aae0f..257b079 100644
--- a/wiki/media.mdwn
+++ b/wiki/media.mdwn
@@ -46,3 +46,7 @@ Luego agregamos y compremeter nuestros cambios [[como siempre|edita]]. Y los emp
 
     git push
 
+
+## Metadata
+
+Para que los listados de audio contengan informacio sobre el audio, debemos editar sus metadatos antes de subirlos. Podria ser hasta conviente incluir en registro en el base de datos de [[MusicBrainz|http://musicbrainz.org/]] para nuestro lanzamientos. 

diff --git a/wiki/media.mdwn b/wiki/media.mdwn
index ba83ad7..d1aae0f 100644
--- a/wiki/media.mdwn
+++ b/wiki/media.mdwn
@@ -1,7 +1,9 @@
+[[!if test="enabled(sidebar)" then="""
 [[!sidebar]]
 """ else="""
 [[!inline pages=sidebar raw=yes]]
 """]]
+
 #Registro Multimedia
 
 Nuestro concepto de Registro Multimedia si rebase en sencillo manejo de ficheros de media y textos sencillos que los describen. 

diff --git a/local.css b/local.css
index 4ac3675..1d20e07 100644
--- a/local.css
+++ b/local.css
@@ -60,9 +60,7 @@ h6 {font-size: 200%;
 .notebox {
     
    font-size: 80%;
-    /* background: url("santodelamor.jpg") no-repeat left top;
-    height: 250px; 
-    width: 200px;*/
+    width: 30%;
     }
 .recentchanges {
     display: block;
diff --git a/wiki/media.mdwn b/wiki/media.mdwn
index aaacebf..ba83ad7 100644
--- a/wiki/media.mdwn
+++ b/wiki/media.mdwn
@@ -1,3 +1,7 @@
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
 #Registro Multimedia
 
 Nuestro concepto de Registro Multimedia si rebase en sencillo manejo de ficheros de media y textos sencillos que los describen. 

diff --git a/wiki/media.mdwn b/wiki/media.mdwn
new file mode 100644
index 0000000..aaacebf
--- /dev/null
+++ b/wiki/media.mdwn
@@ -0,0 +1,42 @@
+#Registro Multimedia
+
+Nuestro concepto de Registro Multimedia si rebase en sencillo manejo de ficheros de media y textos sencillos que los describen. 
+
+[[!template  id=note text="""antes incluir media en su proyecto asegurase configurar [[git-media|https://github.com/schacon/git-media]]"""]]
+
+Si la carpeta de nuestra pagina es `yaxhil`, entonces dentro de ello haremos una carpeta `audio`, y dentro de ellos subcarpetas, por ejemplo `biz_band`, los cuales contengan audio. Para conviniencia podemos poner el registro de este disco en un fichero biz_band.mdwn. 
+
+    yaxhil/index.mdwn 
+    yaxhil/audio/biz_band 
+    yaxhil/audio/biz_band/MOOD_INDIGO.oga 
+    yaxhil/audio/biz_band.mdwn 
+
+El registro de estos audios en el caso del ejemplo seria `yaxhil/audio/biz_band.mdwn`. Su registros puede tener uno de dos modos, manual o automatico.
+
+[[!template  id=note text="""[[!audio /audio/biz_band/MOOD_INDIGO.oga text="Mood Indigo por Biz Band"]]"""]]
+### Registro Manual
+
+Donde si quiera que aparesca el audio en su pagina, evocamos el plugin 'audio' para ikiwiki. Por ejemplo el siguiente codigo es la utilizamos para incluir Mood Indigo en esta pagina: 
+
+    \[[!audio audio/biz_band/MOOD_INDIGO.oga text="Mood Indigo por Biz Band"]]
+
+[[!template  id=note text="""[[!inline  template="inlineaudio" pages="audio/biz_band/* and !*/Discussion" show="5"]]"""]]
+### Registro Automatico
+
+Pon algo de descripcion al principio de `nombre_de_disco`.mdwn y el siguinte codigo para evocar al plugin 'inline' de ikiwiki: 
+
+    
+    \[[!inline  template="inlineaudio" pages="audio/biz_band/* and !*/Discussion" show="10"]]
+
+el ultimo paremetro, 'show', indica el maximo numero de entradas mostrar. Un alimentacion rss es producido automaticamente, para los podcast, igual como si ve a lado derecha de esta pagina 
+
+### Syncronizacion de Datos
+
+Ahora a haber terminado el registro quisieramos syncronizar nuestros datos con el servidor. Primero tendremos que haber instalado y configurado [[git-media|https://github.com/schacon/git-media]]. Para syncronizar nuestros audios en el servidor:
+
+    git media sync
+
+Luego agregamos y compremeter nuestros cambios [[como siempre|edita]]. Y los empujamos todos los cambios al servidor: 
+
+    git push
+

diff --git a/audio.mdwn b/audio.mdwn
index 5290614..34f875d 100644
--- a/audio.mdwn
+++ b/audio.mdwn
@@ -1,3 +1,9 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
 # Audio
 
 [[audio/biz_band]]
diff --git a/audio/biz_band.mdwn b/audio/biz_band.mdwn
index 9cbba2a..422f71a 100644
--- a/audio/biz_band.mdwn
+++ b/audio/biz_band.mdwn
@@ -1,2 +1,7 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
 # Musica de la Biz Band
 [[!inline  template="inlineaudio" pages="audio/biz_band/* and !*/Discussion" show="10"]]

diff --git a/audio/biz_band/ALL_OF_ME.oga b/audio/biz_band/ALL_OF_ME.oga
new file mode 100755
index 0000000..d73050d
--- /dev/null
+++ b/audio/biz_band/ALL_OF_ME.oga
@@ -0,0 +1 @@
+8ee1ac536dd41f47714658a3ea350f6204ce2f88
diff --git a/audio/biz_band/BLUES.oga b/audio/biz_band/BLUES.oga
new file mode 100755
index 0000000..fb4bc7c
--- /dev/null
+++ b/audio/biz_band/BLUES.oga
@@ -0,0 +1 @@
+66fafdcb42ad3f535c10d59eacf4af13d9b48810
diff --git a/audio/biz_band/BUSTER_KEATON_BLUES.oga b/audio/biz_band/BUSTER_KEATON_BLUES.oga
new file mode 100755
index 0000000..3653b38
--- /dev/null
+++ b/audio/biz_band/BUSTER_KEATON_BLUES.oga
@@ -0,0 +1 @@
+48cfc9ae0f19f85d16c91a1525204f5d5f7c842b
diff --git a/audio/biz_band/LEAVES.oga b/audio/biz_band/LEAVES.oga
new file mode 100755
index 0000000..94140f0
--- /dev/null
+++ b/audio/biz_band/LEAVES.oga
@@ -0,0 +1 @@
+b64ba866fa23d37c20a3752ad3cadaa8d48804d9
diff --git a/audio/biz_band/MOOD_INDIGO.oga b/audio/biz_band/MOOD_INDIGO.oga
new file mode 100755
index 0000000..9827e71
--- /dev/null
+++ b/audio/biz_band/MOOD_INDIGO.oga
@@ -0,0 +1 @@
+02ecb5d9786818bb1dc9d6ce9f75ead72c6fed1e

diff --git a/audio/biz_band/ALL_OF_ME.oga b/audio/biz_band/ALL_OF_ME.oga
deleted file mode 100755
index d73050d..0000000
--- a/audio/biz_band/ALL_OF_ME.oga
+++ /dev/null
@@ -1 +0,0 @@
-8ee1ac536dd41f47714658a3ea350f6204ce2f88
diff --git a/audio/biz_band/BLUES.oga b/audio/biz_band/BLUES.oga
deleted file mode 100755
index fb4bc7c..0000000
--- a/audio/biz_band/BLUES.oga
+++ /dev/null
@@ -1 +0,0 @@
-66fafdcb42ad3f535c10d59eacf4af13d9b48810
diff --git a/audio/biz_band/BUSTER_KEATON_BLUES.oga b/audio/biz_band/BUSTER_KEATON_BLUES.oga
deleted file mode 100755
index 3653b38..0000000
--- a/audio/biz_band/BUSTER_KEATON_BLUES.oga
+++ /dev/null
@@ -1 +0,0 @@
-48cfc9ae0f19f85d16c91a1525204f5d5f7c842b
diff --git a/audio/biz_band/LEAVES.oga b/audio/biz_band/LEAVES.oga
deleted file mode 100755
index 94140f0..0000000
--- a/audio/biz_band/LEAVES.oga
+++ /dev/null
@@ -1 +0,0 @@
-b64ba866fa23d37c20a3752ad3cadaa8d48804d9
diff --git a/audio/biz_band/MOOD_INDIGO.oga b/audio/biz_band/MOOD_INDIGO.oga
deleted file mode 100755
index 9827e71..0000000
--- a/audio/biz_band/MOOD_INDIGO.oga
+++ /dev/null
@@ -1 +0,0 @@
-02ecb5d9786818bb1dc9d6ce9f75ead72c6fed1e

diff --git a/aniversario_III.mdwn b/aniversario_III.mdwn
deleted file mode 100644
index b942178..0000000
--- a/aniversario_III.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!if test="enabled(sidebar)" then="""
-[[!sidebar]]
-""" else="""
-[[!inline pages=sidebar raw=yes]]
-"""]]
-# III Aniversario
-[[!inline  template="inlineimg" pages="aniversarios/* and !*/Discussion" show="10"]]
diff --git a/aniversarios/ana.jpg b/aniversarios/ana.jpg
deleted file mode 100644
index 85779d2..0000000
--- a/aniversarios/ana.jpg
+++ /dev/null
@@ -1 +0,0 @@
-6d90db232e7306849e048135dbb605830b101843
diff --git a/aniversarios/bandayagabila.jpg b/aniversarios/bandayagabila.jpg
deleted file mode 100644
index 58610af..0000000
--- a/aniversarios/bandayagabila.jpg
+++ /dev/null
@@ -1 +0,0 @@
-61b9892ccf7188481e3aabfb5bbf02063241cb22
diff --git a/aniversarios/bandayagabila2.jpg b/aniversarios/bandayagabila2.jpg
deleted file mode 100644
index 6f00529..0000000
--- a/aniversarios/bandayagabila2.jpg
+++ /dev/null
@@ -1 +0,0 @@
-7b0fa16de5e387c07e9aebecaf88986ea93360d5
diff --git a/aniversarios/bandayagila.jpg b/aniversarios/bandayagila.jpg
deleted file mode 100644
index 0bd0471..0000000
--- a/aniversarios/bandayagila.jpg
+++ /dev/null
@@ -1 +0,0 @@
-23cedb9ae2fb0659cd09a24ba3f978abf16c9481
diff --git a/aniversarios/intrevistaconeldirector.jpg b/aniversarios/intrevistaconeldirector.jpg
deleted file mode 100644
index a28e181..0000000
--- a/aniversarios/intrevistaconeldirector.jpg
+++ /dev/null
@@ -1 +0,0 @@
-0ba5e7d142554b3bf96f4a726e736ce7034ded21
diff --git a/aniversarios/loscueros.jpg b/aniversarios/loscueros.jpg
deleted file mode 100644
index 5d3768b..0000000
--- a/aniversarios/loscueros.jpg
+++ /dev/null
@@ -1 +0,0 @@
-9534f5aeb926e3358639849ac3adf7728b3089c1
diff --git a/aniversarios/mari.jpg b/aniversarios/mari.jpg
deleted file mode 100644
index b046362..0000000
--- a/aniversarios/mari.jpg
+++ /dev/null
@@ -1 +0,0 @@
-56ca44e181b947760f4627ceb77111c5ef047326
diff --git a/aniversarios/panoramica.jpg b/aniversarios/panoramica.jpg
deleted file mode 100644
index 77394e7..0000000
--- a/aniversarios/panoramica.jpg
+++ /dev/null
@@ -1 +0,0 @@
-20fe3b67a906ced27212a5310e3317408ca7f6ec
diff --git "a/aniversarios/se\303\261oritos.jpg" "b/aniversarios/se\303\261oritos.jpg"
deleted file mode 100644
index 5efb47c..0000000
--- "a/aniversarios/se\303\261oritos.jpg"
+++ /dev/null
@@ -1 +0,0 @@
-bf7c8d584e32fc0fbaecd5e8e438731125f27ae3
diff --git a/audio.mdwn b/audio.mdwn
new file mode 100644
index 0000000..5290614
--- /dev/null
+++ b/audio.mdwn
@@ -0,0 +1,3 @@
+# Audio
+
+[[audio/biz_band]]
diff --git a/images.mdwn b/images.mdwn
index f9bd34b..b46b90a 100644
--- a/images.mdwn
+++ b/images.mdwn
@@ -6,4 +6,3 @@
 # Imágenes
 [[III Aniversario|aniversario_III]]
 
-[[!inline  template="inlineimg" pages="images/* and !*/Discussion" show="10"]]
diff --git a/index.mdwn b/index.mdwn
index 9072b87..a621a95 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,11 +6,10 @@
 
 
 # Radio Comunitaria Yaxhil
-[[!audio http://radio.flujos.org:8000/yaxhilradio.oga class="right"]]
 104.5 FM didza lube 
 (palabras en el aire)
 
-
+[[!img images/aniversarios/panoramica.jpg size="400x224" class="right"]]
 ES UN ESFUERZO DEL PUEBLO DE
 SAN JUAN YAGILA, IXTLAN, OAXACA
 Y DE LOS PUEBLOS QUE ESCUCHAN LA RADIO.
@@ -22,7 +21,6 @@ dando su tiempo sin ningun pago.
 La radio cuenta con un comite que es nombrado
 en asamblea de ciudadanos.
 
-[[!img images/radio_comunitaria_yaxhil.jpg class="left"]]
 La Radio Comunitaria Yaxhil no pertenece
 a ningun partido politico, ni a ningun grupo
 o religion, y su funcionamiento es sin fines
diff --git a/local.css b/local.css
index c3281b4..4ac3675 100644
--- a/local.css
+++ b/local.css
@@ -57,27 +57,13 @@ h6 {font-size: 200%;
 #pageinfo {
   border-top: none;
 }
-.page {
-    padding: 0;
-    }
-.notebox,.audio {
+.notebox {
     
    font-size: 80%;
     /* background: url("santodelamor.jpg") no-repeat left top;
     height: 250px; 
     width: 200px;*/
     }
-audio {
-    width: 225px;
-    margin: 5px 0; 
-    }
-.audio {
-    /*border: 1px solid gray; */
-     float: right;
-     background-color: #ddd;
-     padding: 5px;
-     margin: 5px;
-    }
 .recentchanges {
     display: block;
     clear: both!important;
@@ -92,11 +78,6 @@ audio {
     
     }
 
-    .inlinepage {
-        width:80%;
-        font-size: 60%;
-        }
-
 .left {float:left}
 .right {float: right}
 /*#enlace-directo {display: none}*/
@@ -107,6 +88,7 @@ div.jp-audio, div.jp-video, div.jp-interface {background-color: #fff}
     margin-right: 10px;
     font-size: 12px;
 }
+.sidebar img {margin: 0;padding: 0;}
 img {
    margin: 5px;
    padding: 5px;
diff --git a/sidebar.mdwn b/sidebar.mdwn
index af83ab4..9891c18 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,11 +1,9 @@
-[[!img images/logo.png]]
-## Contenidos
-* [[inicio|http://yaxhil.flujos.org]]
-* [[imágenes|images]] 
-* [[notas]]
-
-## Software
-* [[hora plugin|wiki/hora]]
+[[!img images/nuestrosmedios.jpg size="150x100" alt="logo"]]
+[[!audio http://radio.flujos.org:8000/rockola.oga text="Escucha"]]
+* [[Inicio|http://yaxhil.flujos.org]]
+* [[Imágenes|images]] 
+* [[Audio]]
+* [[Hora plugin|wiki/hora]]
 
 ## Vínculos
 * [[la haine|http://lahaine.org/]]

diff --git a/audio-tar.gz b/audio-tar.gz
new file mode 100644
index 0000000..e76de06
Binary files /dev/null and b/audio-tar.gz differ
diff --git a/audio/biz_band.mdwn b/audio/biz_band.mdwn
new file mode 100644
index 0000000..9cbba2a
--- /dev/null
+++ b/audio/biz_band.mdwn
@@ -0,0 +1,2 @@
+# Musica de la Biz Band
+[[!inline  template="inlineaudio" pages="audio/biz_band/* and !*/Discussion" show="10"]]
diff --git a/audio/biz_band/ALL_OF_ME.oga b/audio/biz_band/ALL_OF_ME.oga
new file mode 100755
index 0000000..d73050d
--- /dev/null
+++ b/audio/biz_band/ALL_OF_ME.oga
@@ -0,0 +1 @@
+8ee1ac536dd41f47714658a3ea350f6204ce2f88
diff --git a/audio/biz_band/BLUES.oga b/audio/biz_band/BLUES.oga
new file mode 100755
index 0000000..fb4bc7c
--- /dev/null
+++ b/audio/biz_band/BLUES.oga
@@ -0,0 +1 @@
+66fafdcb42ad3f535c10d59eacf4af13d9b48810
diff --git a/audio/biz_band/BUSTER_KEATON_BLUES.oga b/audio/biz_band/BUSTER_KEATON_BLUES.oga
new file mode 100755
index 0000000..3653b38
--- /dev/null
+++ b/audio/biz_band/BUSTER_KEATON_BLUES.oga
@@ -0,0 +1 @@
+48cfc9ae0f19f85d16c91a1525204f5d5f7c842b
diff --git a/audio/biz_band/LEAVES.oga b/audio/biz_band/LEAVES.oga
new file mode 100755
index 0000000..94140f0
--- /dev/null
+++ b/audio/biz_band/LEAVES.oga
@@ -0,0 +1 @@
+b64ba866fa23d37c20a3752ad3cadaa8d48804d9
diff --git a/audio/biz_band/MOOD_INDIGO.oga b/audio/biz_band/MOOD_INDIGO.oga
new file mode 100755
index 0000000..9827e71
--- /dev/null
+++ b/audio/biz_band/MOOD_INDIGO.oga
@@ -0,0 +1 @@
+02ecb5d9786818bb1dc9d6ce9f75ead72c6fed1e
diff --git a/audio/biz_band/SOUND_SKA.oga b/audio/biz_band/SOUND_SKA.oga
new file mode 100755
index 0000000..3298e0c
--- /dev/null
+++ b/audio/biz_band/SOUND_SKA.oga
@@ -0,0 +1 @@
+302a7656010826fd121bb51a89d697c1b5476578
diff --git a/audio/biz_band/SUMMERTIME.oga b/audio/biz_band/SUMMERTIME.oga
new file mode 100755
index 0000000..03a78c1
--- /dev/null
+++ b/audio/biz_band/SUMMERTIME.oga
@@ -0,0 +1 @@
+edc106e6dc34885ab1ccf48489d2ef6302ff7ab6
diff --git a/audio/biz_band/THE_CHICKEN.oga b/audio/biz_band/THE_CHICKEN.oga
new file mode 100755
index 0000000..dc1b790
--- /dev/null
+++ b/audio/biz_band/THE_CHICKEN.oga
@@ -0,0 +1 @@
+1b031f9e5680be4d3f12593963dcc3ee248171cc
diff --git a/darkice.cfg.comentarios b/darkice.cfg.comentarios
new file mode 100644
index 0000000..3d1a5da
--- /dev/null
+++ b/darkice.cfg.comentarios
@@ -0,0 +1,35 @@
+## Ejemplo de configuración de Darkice, edita el archivo de acuerdo a 
+## tus necesidades consulta darkice.cfg en su página principal para más 
+## detalles
+
+# está sección describe aspectos generales de la sesión del streaming en vivo
+[general]
+duration = 0    # duración de la codificación en segundos 0 significa infinito 
+bufferSecs = 5  # tamaño del buffer en segundos
+reconnect = yes # reconectar el servidor en caso de que se desconecte
+
+# Esta sección describe la entrada de audio a través de la cual se hará el stream
+[input]
+device          = default # OSS DSP Jack ALSA dispositivo de tarjeta de sonido para la entrada de audio
+sampleRate      = 22050  # sample rate en Hz. prueba con 11025, 22050, 44100 o 48000
+bitsPerSample   = 16        # bits por una prueba de muestra de 16
+channel         = 1         # canales: 1 = mono, 2 = stereo
+
+# Esta sección describe la conexión del streaming al servidor IceCast
+# puede existir hasta 8 secciones como esta, dependiendo de cuantos streamings tengas, [icecast-0] ... [icecast-7]
+# esto puede ser mezclado con las secciones [icecast2-x] y [shoutcast-x]
+[icecast-0]
+format          = vorbis # formato del stream: vorbis
+bitrateMode     = vbr       # modo del bitrate, en este caso constante
+#bitrate         = 64        # bitrate del stream de mp3 enviado al servidor
+quality         = 0.1       # calidad de codificación
+server          = 91.121.134.23    # nombre del servidor en el que está alojado el stream
+port            = 8000      # Puerto del servidor IceCast, normalmente 8000 o 8001
+password        = **** # Contraseña del servidor IceCast
+mountPoint      = yaxil.ogg   # punto de montaje de este stream en el servidor IceCast
+name            = Radio Comunitaria Yaxil # nombre del stream
+description     = haz radio, crea flujos        # descripción del stream
+url             = http://yaxil.flujos.org       # URL relacionada al stream, puede ser la URL de tu página de internet
+genre           = Comunitaria y Libre  # género del stream
+public          = yes       # ¿Quieres que el stream sea publicado en la página del servidor?
+
diff --git a/images/aniversario_III.mdwn b/images/aniversario_III.mdwn
new file mode 100644
index 0000000..d8b8af5
--- /dev/null
+++ b/images/aniversario_III.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+# III Aniversario
+[[!inline  template="inlineimg" pages="images/aniversarios/* and !*/Discussion" show="10"]]
diff --git a/images/aniversarios/ana.jpg b/images/aniversarios/ana.jpg
new file mode 100644
index 0000000..85779d2
--- /dev/null
+++ b/images/aniversarios/ana.jpg
@@ -0,0 +1 @@
+6d90db232e7306849e048135dbb605830b101843
diff --git a/images/aniversarios/bandayagabila.jpg b/images/aniversarios/bandayagabila.jpg
new file mode 100644
index 0000000..58610af
--- /dev/null
+++ b/images/aniversarios/bandayagabila.jpg
@@ -0,0 +1 @@
+61b9892ccf7188481e3aabfb5bbf02063241cb22
diff --git a/images/aniversarios/bandayagabila2.jpg b/images/aniversarios/bandayagabila2.jpg
new file mode 100644
index 0000000..6f00529
--- /dev/null
+++ b/images/aniversarios/bandayagabila2.jpg
@@ -0,0 +1 @@
+7b0fa16de5e387c07e9aebecaf88986ea93360d5
diff --git a/images/aniversarios/bandayagila.jpg b/images/aniversarios/bandayagila.jpg
new file mode 100644
index 0000000..0bd0471
--- /dev/null
+++ b/images/aniversarios/bandayagila.jpg
@@ -0,0 +1 @@
+23cedb9ae2fb0659cd09a24ba3f978abf16c9481
diff --git a/images/aniversarios/intrevistaconeldirector.jpg b/images/aniversarios/intrevistaconeldirector.jpg
new file mode 100644
index 0000000..a28e181
--- /dev/null
+++ b/images/aniversarios/intrevistaconeldirector.jpg
@@ -0,0 +1 @@
+0ba5e7d142554b3bf96f4a726e736ce7034ded21
diff --git a/images/aniversarios/loscueros.jpg b/images/aniversarios/loscueros.jpg
new file mode 100644
index 0000000..5d3768b
--- /dev/null
+++ b/images/aniversarios/loscueros.jpg
@@ -0,0 +1 @@
+9534f5aeb926e3358639849ac3adf7728b3089c1
diff --git a/images/aniversarios/mari.jpg b/images/aniversarios/mari.jpg
new file mode 100644
index 0000000..b046362
--- /dev/null
+++ b/images/aniversarios/mari.jpg
@@ -0,0 +1 @@
+56ca44e181b947760f4627ceb77111c5ef047326
diff --git a/images/aniversarios/panoramica.jpg b/images/aniversarios/panoramica.jpg
new file mode 100644
index 0000000..77394e7
--- /dev/null
+++ b/images/aniversarios/panoramica.jpg
@@ -0,0 +1 @@
+20fe3b67a906ced27212a5310e3317408ca7f6ec
diff --git "a/images/aniversarios/se\303\261oritos.jpg" "b/images/aniversarios/se\303\261oritos.jpg"
new file mode 100644
index 0000000..5efb47c
--- /dev/null
+++ "b/images/aniversarios/se\303\261oritos.jpg"
@@ -0,0 +1 @@
+bf7c8d584e32fc0fbaecd5e8e438731125f27ae3

diff --git a/sidebar.mdwn b/sidebar.mdwn
index 01bbd42..af83ab4 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -7,7 +7,7 @@
 ## Software
 * [[hora plugin|wiki/hora]]
 
-## Afinidades
+## Vínculos
 * [[la haine|http://lahaine.org/]]
 * [[zapateando|http://zapateando.wordpress.com/]]
 * [[kaos en la red|http://www.kaosenlared.net/]]

diff --git a/wiki/hora.mdwn b/wiki/hora.mdwn
index 4216c4d..86ff236 100644
--- a/wiki/hora.mdwn
+++ b/wiki/hora.mdwn
@@ -53,7 +53,7 @@ abrir rhythmbox en el terminal:
 [[!img rhythmbox.png class="left"]]
 ####rhthmbox muere de repente al mometo de reproducir la hora
 probablamente no haz instalado alguna biblioteca de grabaciones de la hora, hay uno en español aqui:
-[[hora_audios-tar.gz]]
+[[audio-tar.gz]]
 
 #### ay flojera! como lo automatizo mientras rhythmbox esta en modo ruleta/aleatorio
 

diff --git a/aniversario_III.mdwn b/aniversario_III.mdwn
index 2db402e..b942178 100644
--- a/aniversario_III.mdwn
+++ b/aniversario_III.mdwn
@@ -1 +1,7 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+# III Aniversario
 [[!inline  template="inlineimg" pages="aniversarios/* and !*/Discussion" show="10"]]
diff --git a/images.mdwn b/images.mdwn
index 1b68420..f9bd34b 100644
--- a/images.mdwn
+++ b/images.mdwn
@@ -3,7 +3,7 @@
 """ else="""
 [[!inline pages=sidebar raw=yes]]
 """]]
-
+# Imágenes
 [[III Aniversario|aniversario_III]]
 
 [[!inline  template="inlineimg" pages="images/* and !*/Discussion" show="10"]]

diff --git a/local.css b/local.css
index b6c8abe..c3281b4 100644
--- a/local.css
+++ b/local.css
@@ -105,6 +105,7 @@ div.jp-audio, div.jp-video, div.jp-interface {background-color: #fff}
 .sidebar {
     float:left;
     margin-right: 10px;
+    font-size: 12px;
 }
 img {
    margin: 5px;
diff --git a/sidebar.mdwn b/sidebar.mdwn
index da5ac6f..01bbd42 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -4,6 +4,9 @@
 * [[imágenes|images]] 
 * [[notas]]
 
+## Software
+* [[hora plugin|wiki/hora]]
+
 ## Afinidades
 * [[la haine|http://lahaine.org/]]
 * [[zapateando|http://zapateando.wordpress.com/]]

diff --git a/aniversario_III.mdwn b/aniversario_III.mdwn
new file mode 100644
index 0000000..2db402e
--- /dev/null
+++ b/aniversario_III.mdwn
@@ -0,0 +1 @@
+[[!inline  template="inlineimg" pages="aniversarios/* and !*/Discussion" show="10"]]
diff --git a/aniversarios/ana.jpg b/aniversarios/ana.jpg
new file mode 100644
index 0000000..85779d2
--- /dev/null
+++ b/aniversarios/ana.jpg
@@ -0,0 +1 @@
+6d90db232e7306849e048135dbb605830b101843
diff --git a/aniversarios/bandayagabila.jpg b/aniversarios/bandayagabila.jpg
new file mode 100644
index 0000000..58610af
--- /dev/null
+++ b/aniversarios/bandayagabila.jpg
@@ -0,0 +1 @@
+61b9892ccf7188481e3aabfb5bbf02063241cb22
diff --git a/aniversarios/bandayagabila2.jpg b/aniversarios/bandayagabila2.jpg
new file mode 100644
index 0000000..6f00529
--- /dev/null
+++ b/aniversarios/bandayagabila2.jpg
@@ -0,0 +1 @@
+7b0fa16de5e387c07e9aebecaf88986ea93360d5
diff --git a/aniversarios/bandayagila.jpg b/aniversarios/bandayagila.jpg
new file mode 100644
index 0000000..0bd0471
--- /dev/null
+++ b/aniversarios/bandayagila.jpg
@@ -0,0 +1 @@
+23cedb9ae2fb0659cd09a24ba3f978abf16c9481
diff --git a/aniversarios/intrevistaconeldirector.jpg b/aniversarios/intrevistaconeldirector.jpg
new file mode 100644
index 0000000..a28e181
--- /dev/null
+++ b/aniversarios/intrevistaconeldirector.jpg
@@ -0,0 +1 @@
+0ba5e7d142554b3bf96f4a726e736ce7034ded21
diff --git a/aniversarios/loscueros.jpg b/aniversarios/loscueros.jpg
new file mode 100644
index 0000000..5d3768b
--- /dev/null
+++ b/aniversarios/loscueros.jpg
@@ -0,0 +1 @@
+9534f5aeb926e3358639849ac3adf7728b3089c1
diff --git a/aniversarios/mari.jpg b/aniversarios/mari.jpg
new file mode 100644
index 0000000..b046362
--- /dev/null
+++ b/aniversarios/mari.jpg
@@ -0,0 +1 @@
+56ca44e181b947760f4627ceb77111c5ef047326
diff --git a/aniversarios/panoramica.jpg b/aniversarios/panoramica.jpg
new file mode 100644
index 0000000..77394e7
--- /dev/null
+++ b/aniversarios/panoramica.jpg
@@ -0,0 +1 @@
+20fe3b67a906ced27212a5310e3317408ca7f6ec
diff --git "a/aniversarios/se\303\261oritos.jpg" "b/aniversarios/se\303\261oritos.jpg"
new file mode 100644
index 0000000..5efb47c
--- /dev/null
+++ "b/aniversarios/se\303\261oritos.jpg"
@@ -0,0 +1 @@
+bf7c8d584e32fc0fbaecd5e8e438731125f27ae3
diff --git a/images.mdwn b/images.mdwn
index bcbec16..1b68420 100644
--- a/images.mdwn
+++ b/images.mdwn
@@ -1 +1,9 @@
-[[!inline  template="inlineimg" pages="images/* and !*/Discussion" show="10" rootpage="images"]]
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
+[[III Aniversario|aniversario_III]]
+
+[[!inline  template="inlineimg" pages="images/* and !*/Discussion" show="10"]]
diff --git a/images/monos.jpg b/images/monos.jpg
new file mode 100644
index 0000000..f595691
--- /dev/null
+++ b/images/monos.jpg
@@ -0,0 +1 @@
+195e95aa7f0c23173f88da3ca4cb5823e1f95f9c
diff --git a/images/programa.jpg b/images/programa.jpg
new file mode 100644
index 0000000..ea584b1
--- /dev/null
+++ b/images/programa.jpg
@@ -0,0 +1 @@
+1ebd590e44d3c208788e8eedb94e2127cc85820a
diff --git a/wiki.mdwn b/wiki.mdwn
new file mode 100644
index 0000000..f247090
--- /dev/null
+++ b/wiki.mdwn
@@ -0,0 +1,6 @@
+[[!meta description="Documentación relacionado a yaxhil.flujos.org"]]
+
+# Documentación relacionado a yaxhil.flujos.org
+[[!inline  pages="wiki/* and !*.css and !*.spx and !*.py and !*.ogg and !*/Discussion " show="0" archive="yes"]]
+# Documentació de ikiwiki
+[[ikiwiki]]
diff --git a/wiki/activar.png b/wiki/activar.png
new file mode 100644
index 0000000..ffb5881
--- /dev/null
+++ b/wiki/activar.png
@@ -0,0 +1 @@
+3698768af0403522988cf567adbc23b316048837
diff --git a/wiki/audio-tar.gz b/wiki/audio-tar.gz
new file mode 100644
index 0000000..7739a43
Binary files /dev/null and b/wiki/audio-tar.gz differ
diff --git a/wiki/config.png b/wiki/config.png
new file mode 100644
index 0000000..a058a8f
--- /dev/null
+++ b/wiki/config.png
@@ -0,0 +1 @@
+014a77caea06355a2794f90d33034ddff0da3208
diff --git a/wiki/edita.mdwn b/wiki/edita.mdwn
new file mode 100644
index 0000000..2c4ee77
--- /dev/null
+++ b/wiki/edita.mdwn
@@ -0,0 +1,44 @@
+#Edicion
+
+despues de leer sobre edicion, agaliza el trabajo a treves de la [[previsualizacion local|preview]]
+
+## Preparar tu sistema
+
+Antes de editar tenemos que hacer unas configuraciones una vez para que si quedan y al siguente vez ya son menos pasos.
+
+### Generar y compartir una llave publica
+
+Para contribuir al wiki necesitas proporcionarnos un llave publica rsa. lo cual si puede producir con el orden:
+
+    ssh-keygen -t rsa -f ~/.ssh/id_rsa
+
+ahora encontraras un fichero id_rsa.pub en la carpeta .ssh de tu home, nos la manda por correo y te agregamos a la ista de usuarios permitidos aceder y editar. 
+
+### Clonar el codigo
+
+    git clone git@flujos.org:yaxhil.git
+
+eso te deja una carpeta "yaxhil" con las ficheros adentro. las que ten van a intersar son los *.mdwn
+## Editar 
+
+cambia a la carpeta "yaxhil" abre uno de los ficheros en un editor de texto editas y guardas. por ejemplo:
+
+    cd manual; gedit index.mdwn
+
+### Agregar cambios al index de tu repositorio personal
+
+    git add index.mdwn
+
+### Compremeta los cambios
+
+cuando compremetemos los cambios es necesario dejar un mensaje para que los demas entienden los cambios. por ejemplo
+
+    git commit -m "agregar link a yaxhil.flujos.org a index.mdwn"
+
+### Empujar los cambios al servidor
+
+    git push 
+
+[[!template  id=note text="""Ojo! para empujar (push) necesitas primer configurar ssh que utiliza el puerto correcto. <b>man ssh_config</b>]]."""]]
+
+y listo! Ya puedes revisar tus cambios en el sitio.
diff --git a/wiki/hora.mdwn b/wiki/hora.mdwn
new file mode 100644
index 0000000..4216c4d
--- /dev/null
+++ b/wiki/hora.mdwn
@@ -0,0 +1,71 @@
+# reproduciendo la hora con rhythmbox
+[[!template  id=note text="""[[!toc levels=3]]"""]]
+
+Hemos escrito un plugin que: 
+
+  * agrega un [[boton|http://www.openclipart.org/people/Anonymous/Anonymous_Sandglass.svg]] a Rhythmbox que al oprimirlo reproduce la hora de la sistema en voz alta
+  * agrega un configurador para el boton, si puede reproducir "En Caliente", o agregar la hora a la cola de reproduccion
+  * agrega un opcion de adelantar o retrotrasar la hora anunciada en comparacion con la de la sistema 
+
+
+[[!img config.png class="left"]]
+
+## obtener el plugin Hora para Rhythmbox
+
+la puedes obtener por git, y luego instalarlo como cualcuier plugin de Rhythmbox. 

(Diff truncated)

diff --git a/images/logo.png b/images/logo.png
index f767b4a..6c648ca 100644
--- a/images/logo.png
+++ b/images/logo.png
@@ -1 +1 @@
-21c8df31d4523c799aaea8b9b33ea46f5f65599f
+33144ca8df98f4cc244dc2e4a82db45e0da12d2f
diff --git a/index.mdwn b/index.mdwn
index a526839..9072b87 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,9 @@
-[[!img images/piedralabrada.png class="left"]]
-[[!img images/logo.png class="right"]]
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
 
 # Radio Comunitaria Yaxhil
 [[!audio http://radio.flujos.org:8000/yaxhilradio.oga class="right"]]
@@ -11,27 +15,22 @@ ES UN ESFUERZO DEL PUEBLO DE
 SAN JUAN YAGILA, IXTLAN, OAXACA
 Y DE LOS PUEBLOS QUE ESCUCHAN LA RADIO.
 
-El dia 28 de diciembre del 2010 cumplimos
-2 años de estar al aire gracias al esfuerzo
+El dia 28 de diciembre del 2011 cumplimos
+3 años de estar al aire gracias al esfuerzo
 de los compañeros y compañeras ke participan
 dando su tiempo sin ningun pago.
 La radio cuenta con un comite que es nombrado
 en asamblea de ciudadanos.
 
+[[!img images/radio_comunitaria_yaxhil.jpg class="left"]]
 La Radio Comunitaria Yaxhil no pertenece
 a ningun partido politico, ni a ningun grupo
 o religion, y su funcionamiento es sin fines
 de lucro.
 
-[[!img images/radio_comunitaria_yaxhil.jpg class="right"]]
 SOMOS DIDZA LUBË (PALBRAS EN EL AIRE)
 Porque el aire es un bien natural, que no
 es de nadie, del cual hacemos uso para
 transmitir la palabra de los pueblos.
 
-[[wiki]] | [[notas]] | [[la haine|http://lahaine.org/]] | 
-[[zapateando|http://zapateando.wordpress.com/]] | 
-[[kaos en la red|http://www.kaosenlared.net/]] | 
-[[oaxaca libertaria|http://oaxaca-libertaria.blogspot.com/]] | 
-[[revolucionemos oaxaca|http://revolucionemosoaxaca.org/]]
 
diff --git a/local.css b/local.css
index 73fba36..b6c8abe 100644
--- a/local.css
+++ b/local.css
@@ -102,3 +102,11 @@ audio {
 /*#enlace-directo {display: none}*/
 div.jp-audio, div.jp-video, div.jp-interface {background-color: #fff}
 
+.sidebar {
+    float:left;
+    margin-right: 10px;
+}
+img {
+   margin: 5px;
+   padding: 5px;
+}
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 614b334..da5ac6f 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,6 +1,12 @@
-[[Recent Comments|comments]]
+[[!img images/logo.png]]
+## Contenidos
+* [[inicio|http://yaxhil.flujos.org]]
+* [[imágenes|images]] 
+* [[notas]]
 
-[[Archives]]
-
-[[Tags]]:
-[[!pagestats style="list" pages="./tags/*" among="./notas/*"]]
+## Afinidades
+* [[la haine|http://lahaine.org/]]
+* [[zapateando|http://zapateando.wordpress.com/]]
+* [[kaos en la red|http://www.kaosenlared.net/]]
+* [[oaxaca libertaria|http://oaxaca-libertaria.blogspot.com/]]
+* [[revolucionemos oaxaca|http://revolucionemosoaxaca.org/]]

diff --git a/images/logo.png b/images/logo.png
new file mode 100644
index 0000000..f767b4a
--- /dev/null
+++ b/images/logo.png
@@ -0,0 +1 @@
+21c8df31d4523c799aaea8b9b33ea46f5f65599f
diff --git a/images/radio_comunitaria_yaxhil.jpg b/images/radio_comunitaria_yaxhil.jpg
new file mode 100644
index 0000000..a6ca819
--- /dev/null
+++ b/images/radio_comunitaria_yaxhil.jpg
@@ -0,0 +1 @@
+5ca114dea611a0488f46df21c96100803b0b1096

diff --git a/images/logo.png b/images/logo.png
new file mode 100644
index 0000000..f767b4a
--- /dev/null
+++ b/images/logo.png
@@ -0,0 +1 @@
+21c8df31d4523c799aaea8b9b33ea46f5f65599f
diff --git a/images/radio_comunitaria_yaxhil.jpg b/images/radio_comunitaria_yaxhil.jpg
new file mode 100644
index 0000000..a6ca819
--- /dev/null
+++ b/images/radio_comunitaria_yaxhil.jpg
@@ -0,0 +1 @@
+5ca114dea611a0488f46df21c96100803b0b1096

diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index f767b4a..0000000
--- a/images/logo.png
+++ /dev/null
@@ -1 +0,0 @@
-21c8df31d4523c799aaea8b9b33ea46f5f65599f
diff --git a/images/radio_comunitaria_yaxhil.jpg b/images/radio_comunitaria_yaxhil.jpg
deleted file mode 100644
index a6ca819..0000000
--- a/images/radio_comunitaria_yaxhil.jpg
+++ /dev/null
@@ -1 +0,0 @@
-5ca114dea611a0488f46df21c96100803b0b1096

diff --git a/images/elhambre.jpg b/images/elhambre.jpg
deleted file mode 100644
index d0b0f33..0000000
--- a/images/elhambre.jpg
+++ /dev/null
@@ -1 +0,0 @@
-3817f529359c11d0a6c561001d8948f5f9111b7c
diff --git a/images/laguerra.jpg b/images/laguerra.jpg
deleted file mode 100644
index 3e1e5bd..0000000
--- a/images/laguerra.jpg
+++ /dev/null
@@ -1 +0,0 @@
-24a4df6c0f142f3f773ae63333616151b9bf991e
diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index f767b4a..0000000
--- a/images/logo.png
+++ /dev/null
@@ -1 +0,0 @@
-21c8df31d4523c799aaea8b9b33ea46f5f65599f
diff --git a/images/radio_comunitaria_yaxhil.jpg b/images/radio_comunitaria_yaxhil.jpg
deleted file mode 100644
index a6ca819..0000000
--- a/images/radio_comunitaria_yaxhil.jpg
+++ /dev/null
@@ -1 +0,0 @@
-5ca114dea611a0488f46df21c96100803b0b1096

diff --git a/images/elhambre.jpg b/images/elhambre.jpg
new file mode 100644
index 0000000..d0b0f33
--- /dev/null
+++ b/images/elhambre.jpg
@@ -0,0 +1 @@
+3817f529359c11d0a6c561001d8948f5f9111b7c
diff --git a/images/elmaiz.gif b/images/elmaiz.gif
new file mode 100644
index 0000000..d76466b
--- /dev/null
+++ b/images/elmaiz.gif
@@ -0,0 +1 @@
+833ca37bb8c758707d5280178cd4fd55cf0a131a
diff --git a/images/laguerra.jpg b/images/laguerra.jpg
new file mode 100644
index 0000000..3e1e5bd
--- /dev/null
+++ b/images/laguerra.jpg
@@ -0,0 +1 @@
+24a4df6c0f142f3f773ae63333616151b9bf991e
diff --git a/images/logo.png b/images/logo.png
new file mode 100644
index 0000000..f767b4a
--- /dev/null
+++ b/images/logo.png
@@ -0,0 +1 @@
+21c8df31d4523c799aaea8b9b33ea46f5f65599f
diff --git a/images/nuestrosmedios.jpg b/images/nuestrosmedios.jpg
new file mode 100644
index 0000000..8da1fc9
--- /dev/null
+++ b/images/nuestrosmedios.jpg
@@ -0,0 +1 @@
+395de7730cbf37ccac7ccadac43582314212b555
diff --git a/images/piedralabrada.png b/images/piedralabrada.png
new file mode 100644
index 0000000..0eee097
--- /dev/null
+++ b/images/piedralabrada.png
@@ -0,0 +1 @@
+43603e211742cbdde8428a6f73dcb4abf79f36aa
diff --git a/images/radio_comunitaria_yaxhil.jpg b/images/radio_comunitaria_yaxhil.jpg
new file mode 100644
index 0000000..a6ca819
--- /dev/null
+++ b/images/radio_comunitaria_yaxhil.jpg
@@ -0,0 +1 @@
+5ca114dea611a0488f46df21c96100803b0b1096
diff --git a/images/radioyaxhil.jpg b/images/radioyaxhil.jpg
new file mode 100644
index 0000000..f11deff
--- /dev/null
+++ b/images/radioyaxhil.jpg
@@ -0,0 +1 @@
+856a2d0ed3023cfd3aaf3bef819a708839df8c79
diff --git a/images/santodelamor.jpg b/images/santodelamor.jpg
new file mode 100644
index 0000000..3f81c21
--- /dev/null
+++ b/images/santodelamor.jpg
@@ -0,0 +1 @@
+ddab7417f97ca387c93124f845b9506f4ba8ce74

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4d72aa8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+*.oga filter=media -crlf
+*.mov filter=media -crlf
+*.ogg filter=media -crlf
+*.mp3 filter=media -crlf
+*.jpg filter=media -crlf
+*.gif filter=media -crlf
+*.png filter=media -crlf
+*.tiff filter=media -crlf
+*.ogv filter=media -crlf
diff --git a/darkice.cfg b/darkice.cfg
new file mode 100644
index 0000000..d02c7e3
--- /dev/null
+++ b/darkice.cfg
@@ -0,0 +1,23 @@
+[general]
+duration        = 0        
+bufferSecs      = 5         
+reconnect       = yes       
+
+[input]
+device          = default  
+sampleRate      = 22050    
+bitsPerSample   = 16       
+channel         = 2        
+[icecast2-0]
+bitrateMode     = vbr    
+format          = vorbis 
+quality         = 0.1        
+server          = 91.121.134.23
+port            = 8001    
+password        = ***** 
+mountPoint      = yaxhilradio.ogg 
+name            = Radio Yaxhil
+description     = Radio Comunitaria Yaxhil
+url             = http://yaxil.flujos.org
+genre           = radio comunitaria
+public          = yes    
diff --git a/images.mdwn b/images.mdwn
new file mode 100644
index 0000000..bcbec16
--- /dev/null
+++ b/images.mdwn
@@ -0,0 +1 @@
+[[!inline  template="inlineimg" pages="images/* and !*/Discussion" show="10" rootpage="images"]]
diff --git a/index.mdwn b/index.mdwn
index d59c67d..a526839 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,11 +1,37 @@
-[[!if test="enabled(sidebar)" then="""
-[[!sidebar]]
-""" else="""
-[[!inline pages=sidebar raw=yes]]
-"""]]
+[[!img images/piedralabrada.png class="left"]]
+[[!img images/logo.png class="right"]]
 
-Benvenidos a su nueva pagina. Siente a libertad modificar ese texto. 
+# Radio Comunitaria Yaxhil
+[[!audio http://radio.flujos.org:8000/yaxhilradio.oga class="right"]]
+104.5 FM didza lube 
+(palabras en el aire)
 
-[[!audio http://radio.flujos.org:8000/rockola.oga]]
 
-[flujos](http://flujos.org).
+ES UN ESFUERZO DEL PUEBLO DE
+SAN JUAN YAGILA, IXTLAN, OAXACA
+Y DE LOS PUEBLOS QUE ESCUCHAN LA RADIO.
+
+El dia 28 de diciembre del 2010 cumplimos
+2 años de estar al aire gracias al esfuerzo
+de los compañeros y compañeras ke participan
+dando su tiempo sin ningun pago.
+La radio cuenta con un comite que es nombrado
+en asamblea de ciudadanos.
+
+La Radio Comunitaria Yaxhil no pertenece
+a ningun partido politico, ni a ningun grupo
+o religion, y su funcionamiento es sin fines
+de lucro.
+
+[[!img images/radio_comunitaria_yaxhil.jpg class="right"]]
+SOMOS DIDZA LUBË (PALBRAS EN EL AIRE)
+Porque el aire es un bien natural, que no
+es de nadie, del cual hacemos uso para
+transmitir la palabra de los pueblos.
+
+[[wiki]] | [[notas]] | [[la haine|http://lahaine.org/]] | 
+[[zapateando|http://zapateando.wordpress.com/]] | 
+[[kaos en la red|http://www.kaosenlared.net/]] | 
+[[oaxaca libertaria|http://oaxaca-libertaria.blogspot.com/]] | 
+[[revolucionemos oaxaca|http://revolucionemosoaxaca.org/]]
+
diff --git a/local.css b/local.css
new file mode 100644
index 0000000..73fba36
--- /dev/null
+++ b/local.css
@@ -0,0 +1,104 @@
+    /* ikiwiki local style sheet */
+    /* Add local styling here, instead of modifying style.css. */
+
+    html {
+        background-color: #2e4741;
+        }
+
+
+    body {
+        width: 900px;
+        margin: 10px auto;
+         box-shadow: 0 0 10px rgb(0,0,0);  
+        -moz-box-shadow: 0 0 10px rgb(0,0,0); 
+        -webkit-box-shadow: 0 0 10px rgb(0,0,0);  
+        min-height: 340px;
+        padding: 5px 10px;
+        background: #FFF ;
+       
+        }
+    p {
+        margin: .5em 0;
+        }
+    /* no si puede cambiar la cabezera :( */
+
+    .pageheader, #pageinfo {
+        display: none;
+            }
+a, h1 {
+   text-decoration: none;
+   color: #150e28;
+    }
+h1, h2 {
+    text-transform: capitalize; 
+    }
+a:hover {
+    text-decoration: underline;
+    }    
+h1, a {
+    text-shadow:1px 1px 1px #CCCCCC;
+
+    }
+h6 {font-size: 200%;
+    margin: 0;
+    padding: 0 5px;
+    background-color: #2E4741;
+    color: #fff;
+}
+.error  
+ {  padding: 5px;
+    background-color: #ece769;
+    border: 1px dashed #d00e15;
+    }
+/*on the other hand recentchantes are useful .actions ul,*/ 
+.pagedate, span .title  {
+  display: none;
+}
+#pageinfo {
+  border-top: none;
+}
+.page {
+    padding: 0;
+    }
+.notebox,.audio {
+    
+   font-size: 80%;
+    /* background: url("santodelamor.jpg") no-repeat left top;
+    height: 250px; 
+    width: 200px;*/
+    }
+audio {
+    width: 225px;
+    margin: 5px 0; 
+    }
+.audio {
+    /*border: 1px solid gray; */
+     float: right;
+     background-color: #ddd;
+     padding: 5px;
+     margin: 5px;
+    }
+.recentchanges {
+    display: block;
+    clear: both!important;
+    font-size: small;
+    }
+
+.recentchanges .diff {
+    display:block;
+}
+
+#pagebody {
+    
+    }

(Diff truncated)

diff --git a/archives/2012.mdwn b/archives/2012.mdwn
new file mode 100644
index 0000000..75341be
--- /dev/null
+++ b/archives/2012.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2012 pages="page(notas/*) and !*/Discussion"]]
diff --git a/archives/2012/01.mdwn b/archives/2012/01.mdwn
new file mode 100644
index 0000000..955eb49
--- /dev/null
+++ b/archives/2012/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/02.mdwn b/archives/2012/02.mdwn
new file mode 100644
index 0000000..267036f
--- /dev/null
+++ b/archives/2012/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/03.mdwn b/archives/2012/03.mdwn
new file mode 100644
index 0000000..e953a2c
--- /dev/null
+++ b/archives/2012/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/04.mdwn b/archives/2012/04.mdwn
new file mode 100644
index 0000000..73de115
--- /dev/null
+++ b/archives/2012/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/05.mdwn b/archives/2012/05.mdwn
new file mode 100644
index 0000000..abf20f1
--- /dev/null
+++ b/archives/2012/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/06.mdwn b/archives/2012/06.mdwn
new file mode 100644
index 0000000..40e76d5
--- /dev/null
+++ b/archives/2012/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/07.mdwn b/archives/2012/07.mdwn
new file mode 100644
index 0000000..fbb359c
--- /dev/null
+++ b/archives/2012/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/08.mdwn b/archives/2012/08.mdwn
new file mode 100644
index 0000000..8126abd
--- /dev/null
+++ b/archives/2012/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/09.mdwn b/archives/2012/09.mdwn
new file mode 100644
index 0000000..227d0a4
--- /dev/null
+++ b/archives/2012/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/10.mdwn b/archives/2012/10.mdwn
new file mode 100644
index 0000000..c8a2302
--- /dev/null
+++ b/archives/2012/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/11.mdwn b/archives/2012/11.mdwn
new file mode 100644
index 0000000..ad9f600
--- /dev/null
+++ b/archives/2012/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2012/12.mdwn b/archives/2012/12.mdwn
new file mode 100644
index 0000000..dfff1db
--- /dev/null
+++ b/archives/2012/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2012 pages="page(notas/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2012) and page(notas/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eecda60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki
diff --git a/archives.mdwn b/archives.mdwn
new file mode 100644
index 0000000..d07b73b
--- /dev/null
+++ b/archives.mdwn
@@ -0,0 +1,8 @@
+[[!if test="archives/*" then="""
+Browse through blog archives by year:
+[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
+"""
+else="""
+You need to use the `ikiwiki-calendar` program to generate calendar-based
+archive pages.
+"""]]
diff --git a/comentarios.mdwn b/comentarios.mdwn
new file mode 100644
index 0000000..7ab343c
--- /dev/null
+++ b/comentarios.mdwn
@@ -0,0 +1,10 @@
+[[!sidebar content="""
+[[!inline pages="comment_pending(./notas/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
+Comments in the [[!commentmoderation desc="moderation queue"]]:
+[[!pagecount pages="comment_pending(./notas/*)"]]
+"""]]
+
+Recent comments on notas in the [[blog|index]]:
+[[!inline pages="./notas/*/Discussion or comment(./notas/*)"
+template="comment"]]
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..d59c67d
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,11 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
+Benvenidos a su nueva pagina. Siente a libertad modificar ese texto. 
+
+[[!audio http://radio.flujos.org:8000/rockola.oga]]
+
+[flujos](http://flujos.org).
diff --git a/notas.mdwn b/notas.mdwn
new file mode 100644
index 0000000..d81fd94
--- /dev/null
+++ b/notas.mdwn
@@ -0,0 +1,3 @@
+Aqui una lista completo de notas en el [[blog|index]].
+
+[[!inline pages="page(./notas/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]
diff --git a/notas/first_post.mdwn b/notas/first_post.mdwn
new file mode 100644
index 0000000..343497d
--- /dev/null
+++ b/notas/first_post.mdwn
@@ -0,0 +1,2 @@
+This is the first post to this example blog. To add new posts, just add
+files to the posts/ subdirectory, or use the web form.
diff --git a/sidebar.mdwn b/sidebar.mdwn
new file mode 100644
index 0000000..614b334
--- /dev/null
+++ b/sidebar.mdwn
@@ -0,0 +1,6 @@
+[[Recent Comments|comments]]
+
+[[Archives]]
+
+[[Tags]]:
+[[!pagestats style="list" pages="./tags/*" among="./notas/*"]]
diff --git a/tags.mdwn b/tags.mdwn
new file mode 100644
index 0000000..77029d0
--- /dev/null
+++ b/tags.mdwn
@@ -0,0 +1,3 @@
+[[!pagestats pages="./tags/*" among="./notas/*"]]
+
+On the right you can see the tag cloud for this blog.