From e661a778051e071f2d45ff1f4d02747038e6031d Mon Sep 17 00:00:00 2001
From: John Montero <jmonteroc@gmail.com>
Date: Sun, 30 Oct 2011 07:37:33 -0500
Subject: [PATCH] =?UTF-8?q?agregando=20secci=C3=B3n=20de=20docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hgignore                   |  1 +
 _themes/bs_pype/base.html   | 15 +++++++++++++++
 _themes/bs_pype/header.html |  1 +
 docs.rst                    | 34 ++++++++++++++++++++++++++++++++++
 index.rst                   | 10 ++++++++++
 5 files changed, 61 insertions(+)
 create mode 100644 docs.rst

diff --git a/.hgignore b/.hgignore
index 5f08eb2..6b33fe8 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,4 @@
 \..*\.swo$
 \.pyc$
 \.DS_Store$
+env/
diff --git a/_themes/bs_pype/base.html b/_themes/bs_pype/base.html
index f3df2d4..97f114f 100644
--- a/_themes/bs_pype/base.html
+++ b/_themes/bs_pype/base.html
@@ -47,6 +47,10 @@
   <script src="{{ pathto('_static/javascript/bootstrap/1.3.0/bootstrap-dropdown.js', 1) }}"></script>
   <script src="{{ pathto('_static/javascript/bootstrap/1.3.0/bootstrap-modal.js', 1) }}"></script>
   <script src="{{ pathto('_static/javascript/bootstrap/1.3.0/bootstrap-popover.js', 1) }}"></script>
+<<<<<<< local
+  <script src="{{ pathto('_static/javascript/bootstrap//1.3.0/bootstrap-tabs.js', 1) }}"></script>
+  <script src="{{ pathto('_static/javascript/libs/jquery.tweet.js', 1) }}"></script> 
+=======
   <script src="{{ pathto('_static/javascript/bootstrap/1.3.0/bootstrap-tabs.js', 1) }}"></script>
   <script src="{{ pathto('_static/javascript/bootstrap/1.3.0/bootstrap-twipsy.js', 1) }}"></script>
   
@@ -61,7 +65,18 @@
         });
     });
 </script> 
+>>>>>>> other
 
+  <script type='text/javascript'>
+    $(document).ready(function(){
+        $(".tweet").tweet({
+            username: "pythonperu",
+            avatar_size: 32,
+            count: 10,
+            loading_text: "Cargando tweets..."
+        });
+    });
+  </script> 
   <!--[if lt IE 7 ]>
   <script src={{ pathto('_static/javascript/libs/dd_belatedpng.js', 1) }}"></script>
   <script> DD_belatedPNG.fix('img, .png_bg');</script>
diff --git a/_themes/bs_pype/header.html b/_themes/bs_pype/header.html
index 65b7e00..4e46e81 100644
--- a/_themes/bs_pype/header.html
+++ b/_themes/bs_pype/header.html
@@ -11,6 +11,7 @@ <h3><a href="{{ pathto('index')}}">Python.pe</a></h3>
             <li><a href="{{ pathto('miembros/index')}}">Miembros</a>
             <li><a href="{{ pathto('proyectos')}}">Proyectos</a>
             <li><a href="{{ pathto('recetario')}}">Recetario</a>
+            <li><a href="{{ pathto('docs')}}">Docs</a>
             <li><a href="{{ pathto('faq')}}">FAQ</a>
           </ul>
 
diff --git a/docs.rst b/docs.rst
new file mode 100644
index 0000000..45c6599
--- /dev/null
+++ b/docs.rst
@@ -0,0 +1,34 @@
+Documentación
+==============
+
+reStructuredText
+----------------
+
+* Editor: http://rst.ninjs.org/
+
+Control de Versiones
+--------------------
+
+* Control de Versiones: http://www.etnassoft.com/biblioteca/categoria/control_de_versiones/
+* Control Distribuido de Revisiones con Mercurial (Español):  http://devnull.li/~ikks/hgbook/hgbook.pdf
+
+Rest Framework
+--------------
+
+* Web2py integra experimentalmente REST EASY: http://vimeo.com/21133657
+* Pecan: http://pecan.readthedocs.org/en/latest/rest.html
+* Django-piston: https://bitbucket.org/jespern/django-piston/
+* Django-piston y javascript: http://weblog.mattdorn.com/content/restful-web-apps-with-django-piston-and-ext-js/
+* Django-tastypie: http://django-tastypie.readthedocs.org/en/latest/index.html
+* Cherrypy (MethodDispatcher): http://docs.cherrypy.org/dev/refman/_cpdispatch.html#cherrypy._cpdispatch.MethodDispatcher
+* Protocolo Shoji: http://www.aminus.org/rbre/shoji/shoji-draft-02.txt
+
+Pycamp
+------
+
+* Como funciona un pycamp: http://protocultura.tumblr.com/post/11869339316/como-funciona-un-pycamp
+
+Barcamp
+-------
+
+* http://es.wikipedia.org/wiki/BarCamp
diff --git a/index.rst b/index.rst
index 5bf469d..8eba65e 100644
--- a/index.rst
+++ b/index.rst
@@ -1,5 +1,12 @@
 
 .. raw:: html
+<<<<<<< local
+
+    <div class="alert-message error fade in" data-alert="alert">
+        <p><strong>Próxima Reunión: Viernes 28 de Octubre</strong></p>
+    </div>
+=======
+>>>>>>> other
     
     <div class="page-header">
         <h1>Bienvenido</h1>
@@ -15,6 +22,9 @@
           <h3>Síguenos en @pythonperu:</h3>
           <div class="tweet"></div>
         </div>
+        <div class="span-one-third">
+          <div class="tweet"></div>  
+        </div>
     </div> 
 
     <div class="row">