diff options
| author | Henrik Nord <[email protected]> | 2016-03-08 14:51:51 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-03-08 14:51:51 +0100 |
| commit | 92573ea08320c05f233e978aba2aa7a4463b3617 (patch) | |
| tree | e3f81cf077ffab693447dbddc108a236b1421dd9 | |
| parent | 7ba125fafa1da21d8780bcdae97f1ef56fb6a39a (diff) | |
| parent | 043133b500274669fa8b5b894939280185941ce3 (diff) | |
| download | otp-92573ea08320c05f233e978aba2aa7a4463b3617.tar.gz otp-92573ea08320c05f233e978aba2aa7a4463b3617.tar.bz2 otp-92573ea08320c05f233e978aba2aa7a4463b3617.zip | |
Merge branch 'maint'
| -rw-r--r-- | HOWTO/INSTALL.md | 2 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | lib/kernel/doc/src/app.xml | 2 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/filename.xml | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md index a823d5abbc..43bcdb3a9e 100644 --- a/HOWTO/INSTALL.md +++ b/HOWTO/INSTALL.md @@ -406,7 +406,7 @@ Some of the available `configure` options are: that has to be the same as the filename. You also have to define `STATIC_ERLANG_{NIF,DRIVER}` when compiling the .o files for the nif/driver. If your nif/driver depends on some other dynamic library, you now have to link - that to the Erlang VM binary. This is easily achived by passing `LIBS=-llibname` + that to the Erlang VM binary. This is easily achieved by passing `LIBS=-llibname` to configure. * `--without-$app` - By default all applications in Erlang/OTP will be included in a release. If this is not wanted it is possible to specify that Erlang/OTP @@ -61,6 +61,12 @@ In short: * 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. +Bug Reports +-------------------------- + +Please look at the [instructions for submitting bugs reports] [6]. + + Copyright and License --------------------- @@ -89,3 +95,4 @@ Copyright and License [3]: http://www.erlang.org/static/doc/mailinglist.html [4]: http://erlang.github.com/otp/ [5]: HOWTO/INSTALL.md + [6]: https://github.com/erlang/otp/wiki/Bug-reports diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml index d6d6167923..35feec144e 100644 --- a/lib/kernel/doc/src/app.xml +++ b/lib/kernel/doc/src/app.xml @@ -201,7 +201,7 @@ RTDeps [ApplicationVersion] [] how to compare application versions see <seealso marker="doc/system_principles:versions">the documentation of versions in the system principles - guide</seealso>. Note that that the application version + guide</seealso>. Note that the application version specifies a source code version. An additional indirect requirement is that installed binary application of the specified version has been built so that it is diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 65009753f3..ce6aba3657 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -368,7 +368,7 @@ true <desc> <p>Converts <c><anno>Path</anno></c> to a form accepted by the command shell and native applications on the current platform. On Windows, - forward slashes is converted to backward slashes. On all + forward slashes are converted to backward slashes. On all platforms, the name is normalized as done by <c>join/1</c>.</p> <pre> 19> <input>filename:nativename("/usr/local/bin/").</input> % Unix |