Skip to content

Commit

Permalink
Merge pull request webmachine#247 from basho/develop
Browse files Browse the repository at this point in the history
README updates: broken URLs, org status
  • Loading branch information
mbbroberg committed Jun 23, 2015
2 parents ad8917a + 14940e1 commit 06a880f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions README.org
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
* webmachine
This project began [[http://basho.com][at Basho]], the creators and maintainers of Riak. Due to the importance of webmachine to the broader Erlang community, a new organization was formed. Please contact [[http://github.com/seancribbs][@seancribbs]] to get involved.

** Overview

[[http://travis-ci.org/basho/webmachine][Travis-CI]] :: [[https://secure.travis-ci.org/basho/webmachine.png]]
[[http://travis-ci.org/basho/webmachine][Travis-CI]] :: [[https://travis-ci.org/Webmachine/webmachine.svg?branch=develop]]

Webmachine is an application layer that adds HTTP semantic awareness
on top of the excellent bit-pushing and HTTP syntax-management
provided by mochiweb, and provides a simple and clean way to connect
that to your application's behavior.

More information is available [[http://webmachine.basho.com/][here]].
More information is available [[https://github.com/Webmachine/webmachine/wiki][here]]. You can also read past blog post about Webmachine [[http://basho.com/tag/webmachine/][here]].

** Quick Start
A shell script is provided in the =webmachine= repository to help
Expand Down Expand Up @@ -37,7 +39,7 @@ make

The application will be available at [[http://localhost:8080]].

To learn more continue reading [[http://webmachine.basho.com/][here]].
To learn more continue reading [[https://github.com/Webmachine/webmachine/wiki][here]].

** Contributing
We encourage contributions to =webmachine= from the community.
Expand Down

0 comments on commit 06a880f

Please sign in to comment.