Permalink
Browse files

Merge pull request #9 from voylinux/correct_best_practices

Correct best practices
  • Loading branch information...
2 parents c417b8e + 5387f2c commit 90d1c1cb1f8cd281164b479958932c8ebc7d9184 @FrancescaK committed Jun 16, 2014
Showing with 51 additions and 11 deletions.
  1. +1 −1 Blogging.md
  2. +16 −10 README.md
  3. +34 −0 README_en.md
View
@@ -25,7 +25,7 @@ _Your company blog_ Many great companies have engineering blogs where they publi
###Sharing Your Content
-There are a number of different social channels you can use to share your content listed in our [Blogging Best Practices section](blogging_best_practices.md#spread-the-word)
+There are a number of different social channels you can use to share your content listed in our [Blogging Best Practices section](Blogging%20Best%20Practices.md)
###Planet MongoDB
View
@@ -1,20 +1,26 @@
-The MongoDB Community Kit
+El Kit de la Comunidad de Mongodb
====================================
-Hello and welcome to the MongoDB Community Kit. This kit is designed to give guidance to those interested in
-participating in the MongoDB community. Included are directives meant to help you, as a user and community member, assist
-others in achieving success in our growing open-source community.
+Hola y bienvenido al Kit de la Comunidad de Mongodb. Está diseñado para proporcionar una
+guía a aquellos interesados en participar en la comunidad de Mongodb. Incluye
+las directivas destinadas a servirte de ayuda, como usuario y como miembro de la
+comunidad, para asistir a otros en alcanzar el éxito en hacer crecer la comunidad
+open-source.
+
+Tabla de contenidos:
+
+* [Carta al promotor: Bienvenido al Kit de Desarrollador Promotor](Una%20carta%20al%20promotor.md)
+* [Contribuir a la documentación](Contribuir%20a%20la%20documentaci%C3%B3n.md)
+* [Contribuir al código](Contribuir%20al%20codigo.md)
-Table of Contents:
-* [Letter to the Advocate: Welcome to the Developer Advocacy Kit](A%20Letter%20to%20the%20Advocate.md)
-* [Contributing to the Docs](Contributing%20to%20the%20Docs.md)
-* [Contributing Code](Contributing%20Code.md)
* [Blogging](Blogging.md)
* [Blogging Best Practices](Blogging%20Best%20Practices.md)
* [Starting a MongoDB User Group](MongoDB%20User%20Groups.md)
* [Speaking about MongoDB](Speaking%20About%20MongoDB.md)
* [Advocate for MongoDB at Your Company](At%20Your%20Company.md)
-###License
-This package is released under the [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)
+###Licencia
+Este paquete se distribuye bajo licencia [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)
+
+*Este contenido es una traducción de [README](README_en.md)
View
@@ -0,0 +1,34 @@
+The MongoDB Community Kit
+====================================
+
+<<<<<<< HEAD
+Hello and welcome to the MongoDB Community Kit. This kit is designed to give guidance to those interested in
+participating in the MongoDB community. Included are directives meant to help you, as a user and community member, assist
+others in achieving success in our growing open-source community.
+=======
+Hola y bienvenido al Kit de la Comunidad de Mongodb. Está diseñado para proporcionar una
+guía a aquellos interesados en participar en la comunidad de Mongodb. Incluye
+las directivas destinadas a servirte de ayuda, como usuario y como miembro de la
+comunidad, para asistir a otros en alcanzar el éxito en hacer crecer la comunidad
+open-source.
+
+Tabla de contenidos:
+
+* [Carta al promotor: Bienvenido al Kit de Desarrollador Promotor](Una%20carta%20al%20promotor.md)
+* [Contribuir a la documentación](Contribuir%20a%20la%20documentaci%C3%B3n.md)
+* [Contribuir al código](Contribuir%20al%20codigo.md)
+>>>>>>> 17913a5fcd6642e4444f7dfcd532ff11e548bb67
+
+Table of Contents:
+
+* [Letter to the Advocate: Welcome to the Developer Advocacy Kit](A%20Letter%20to%20the%20Advocate.md)
+* [Contributing to the Docs](Contributing%20to%20the%20Docs.md)
+* [Contributing Code](Contributing%20Code.md)
+* [Blogging](Blogging.md)
+ * [Blogging Best Practices](Blogging%20Best%20Practices.md)
+* [Starting a MongoDB User Group](MongoDB%20User%20Groups.md)
+* [Speaking about MongoDB](Speaking%20About%20MongoDB.md)
+* [Advocate for MongoDB at Your Company](At%20Your%20Company.md)
+
+###License
+This package is released under the [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)

0 comments on commit 90d1c1c

Please sign in to comment.