Skip to content

Commit

Permalink
Merge branch 'henrik/doc-fixes' into maint
Browse files Browse the repository at this point in the history
* henrik/doc-fixes:
  Fix typo in INSTALL.md
  Update README.md
  Fix typo in 'app' documentation
  s/is/are
  • Loading branch information
proxyles committed Mar 8, 2016
2 parents 652b67b + 4a39536 commit 043133b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion HOWTO/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/kernel/doc/src/app.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/stdlib/doc/src/filename.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
<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
Expand Down

0 comments on commit 043133b

Please sign in to comment.