Permalink
Browse files

Issue #20: default branch to master

  • Loading branch information...
1 parent b89668e commit 35f8296a25d14c5c1e3209399a2c1856700d9d5b @uwiger uwiger committed Jul 17, 2012
Showing with 15 additions and 12 deletions.
  1. +7 −7 README.md
  2. +1 −1 doc/README.md
  3. +1 −1 doc/overview.edoc
  4. +6 −3 src/edown_doclet.erl
View
@@ -6,7 +6,7 @@
Copyright (c) 2010 Erlang Solutions Ltd
-__Authors:__ [`ulf.wiger@erlang-solutions.com`](mailto:ulf.wiger@erlang-solutions.com).
+__Authors:__ [`ulf.wiger@feuerlabs.com`](mailto:ulf.wiger@feuerlabs.com).
Status:
@@ -67,7 +67,7 @@ markedoc
The sed script bin/markedoc works in the opposite direction and converts
your `README.md` to an `EDoc` file.
-See [bin/MARKEDOC-README.md](http://github.com/esl/edown/blob/master/bin/MARKEDOC-README.md).
+See [bin/MARKEDOC-README.md](http://github.com/esl/edown/blob/0.3.1/bin/MARKEDOC-README.md).
**FreeBSD, Mac OS X**`$ sed -E -f markedoc.sed <markdown file> > <edoc file>`
@@ -77,9 +77,9 @@ See [bin/MARKEDOC-README.md](http://github.com/esl/edown/blob/master/bin/MARKEDO
<table width="100%" border="0" summary="list of modules">
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_doclet.md" class="module">edown_doclet</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_layout.md" class="module">edown_layout</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_lib.md" class="module">edown_lib</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_make.md" class="module">edown_make</a></td></tr>
-<tr><td><a href="http://github.com/esl/edown/blob/master/doc/edown_xmerl.md" class="module">edown_xmerl</a></td></tr></table>
+<tr><td><a href="http://github.com/esl/edown/blob/0.3.1/doc/edown_doclet.md" class="module">edown_doclet</a></td></tr>
+<tr><td><a href="http://github.com/esl/edown/blob/0.3.1/doc/edown_layout.md" class="module">edown_layout</a></td></tr>
+<tr><td><a href="http://github.com/esl/edown/blob/0.3.1/doc/edown_lib.md" class="module">edown_lib</a></td></tr>
+<tr><td><a href="http://github.com/esl/edown/blob/0.3.1/doc/edown_make.md" class="module">edown_make</a></td></tr>
+<tr><td><a href="http://github.com/esl/edown/blob/0.3.1/doc/edown_xmerl.md" class="module">edown_xmerl</a></td></tr></table>
View
@@ -6,7 +6,7 @@
Copyright (c) 2010 Erlang Solutions Ltd
-__Authors:__ [`ulf.wiger@erlang-solutions.com`](mailto:ulf.wiger@erlang-solutions.com).
+__Authors:__ [`ulf.wiger@feuerlabs.com`](mailto:ulf.wiger@feuerlabs.com).
Status:
View
@@ -1,4 +1,4 @@
-@author <ulf.wiger@erlang-solutions.com>
+@author <ulf.wiger@feuerlabs.com>
@copyright 2010 Erlang Solutions Ltd
@title Edown - Markdown generated from Edoc
View
@@ -225,11 +225,14 @@ do_redirect(Href, Prefix) ->
end.
get_git_branch() ->
- Git = os:cmd("git describe --always --all"),
- case string:tokens(Git, " \n/") of
+ case os:cmd("git describe --always --all") of
+ "fatal:" ++ _ -> "master"; % sensible default
+ Git ->
+ case string:tokens(Git, " \n/") of
[_, Branch] -> Branch;
Other -> erlang:error({cannot_get_git_branch, Other})
- end.
+ end
+ end.
%% Tried to display logo in a table on top of page, but not working.
%% Presumably, this hits some limitation of Markdown

0 comments on commit 35f8296

Please sign in to comment.