aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-07-27 18:58:22 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-07-27 18:58:22 +0200
commit4d7ff6ecd39ae6aef767760906b7a19cd7e98f7a (patch)
treee9afb4aaf13aa4bdcf10f63748d147c5182bf75e
parent8ced228bed88f32a1f1b63ed5d37ada777e1de0b (diff)
parent4d5107f1d260c4b3bb36eda8ef2fba5b845f7d32 (diff)
downloadotp-4d7ff6ecd39ae6aef767760906b7a19cd7e98f7a.tar.gz
otp-4d7ff6ecd39ae6aef767760906b7a19cd7e98f7a.tar.bz2
otp-4d7ff6ecd39ae6aef767760906b7a19cd7e98f7a.zip
Merge branch 'egil/r16/fix-howto-links'
* egil/r16/fix-howto-links: Fix broken links in BENCHMARKS.md Fix FAQ link and add link to proposed updates
-rw-r--r--HOWTO/BENCHMARKS.md4
-rw-r--r--README.md9
2 files changed, 7 insertions, 6 deletions
diff --git a/HOWTO/BENCHMARKS.md b/HOWTO/BENCHMARKS.md
index 361d99256d..b3df4638ea 100644
--- a/HOWTO/BENCHMARKS.md
+++ b/HOWTO/BENCHMARKS.md
@@ -68,6 +68,6 @@ At the moment of writing this HOWTO the tool for viewing benchmark results is
not available as opensource. This will hopefully change in the near future.
- [release the tests]: README.testing.md#releasing-tests
- [install the tests]: README.testing.md#configuring-the-test-environment
+ [release the tests]: TESTING.md#releasing-tests
+ [install the tests]: TESTING.md#configuring-the-test-environment
diff --git a/README.md b/README.md
index b7addf72e2..1eddec9256 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Building and Installing
-----------------------
Information on building and installing Erlang/OTP can be found
-in the [$ERL_TOP/HOWTO/INSTALL.md][] document.
+in the [$ERL_TOP/HOWTO/INSTALL.md] [5] document.
Contributing to Erlang/OTP
--------------------------
@@ -46,7 +46,7 @@ In short:
may suggest improvements that are needed before the change can be accepted
and merged.
-* Once or twice a week, a status email called "What's cooking in Erlang/OTP"
+* Once or twice a week, a status email called ["What's cooking in Erlang/OTP"] [4]
will be sent to the [`erlang-patches`] [3] mailing list.
Copyright and License
@@ -73,5 +73,6 @@ Copyright and License
[1]: http://www.erlang.org
[2]: http://wiki.github.com/erlang/otp/submitting-patches
- [3]: http://www.erlang.org/faq.html
- [$ERL_TOP/HOWTO/INSTALL.md]: HOWTO/INSTALL.md
+ [3]: http://www.erlang.org/faq/faq.html
+ [4]: http://erlang.github.com/otp/
+ [5]: HOWTO/INSTALL.md