Browse files

manual merge of #48

  • Loading branch information...
2 parents dfe6833 + 5cf995e commit 94157d36246c01f23f956e82e12653691c6e848c Mark Phillips committed Nov 27, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0
@@ -58,10 +58,12 @@ This should be updated fairly regularly. As usual, **pull requests are encourage
* [Ember.js]( - The overall navigation could be done a bit better but the presentation and readability is quite nice. (contributed by [@cmeik](
* [DotCloud Platform Docs]( - Responsive, focused, simple, and all-around useable.
* [Mashape API Docs]( - Clean auto-generated documentations for APIs
+<<<<<<< HEAD
* [Basho Docs]( - Well-designed, excellent use of versioning, integrated search, and much more.
* [ Docs]( - Well-structured, clean, responsive, comprehensive. Bootstrap-based design.
* [Go By Example]( - Clean, simple, and extensive. These docs that make you want to learn Go just because they make it so straightforward.
* [99s Ranch User Guide]( - Pretty clear and thorough user guide. (contributed by [@lenary](!/lenary))
+* [Gevent API Docs]( - Clean, polished, API docs for Gevent. (contributed by [rubik](
### Writing about Docs (again, in no particular order)

0 comments on commit 94157d3

Please sign in to comment.