diff options
| author | Sverker Eriksson <[email protected]> | 2018-07-16 19:28:25 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-07-16 19:28:25 +0200 |
| commit | eb785f640e454a0a893da133e5e904b2b10f4017 (patch) | |
| tree | 46e7a46bbf0647dbf24412b37436e51ee77a0f09 | |
| parent | 736f6d4867943289391ae7417949635e569ce3d1 (diff) | |
| parent | d557a4090f593faff4ef4f990a1ca73bfebaab83 (diff) | |
| download | otp-eb785f640e454a0a893da133e5e904b2b10f4017.tar.gz otp-eb785f640e454a0a893da133e5e904b2b10f4017.tar.bz2 otp-eb785f640e454a0a893da133e5e904b2b10f4017.zip | |
Merge branch 'maint'
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | erts/doc/src/erl_nif.xml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c89301d0eb..96db464b52 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,6 +43,7 @@ for more information. You can contribute to Erlang/OTP by opening a Pull Request. Make sure you create a new branch for your pull request with `git checkout -b new-branch-name`. +Give the branch a short but descriptive name, like `stdlib/lists-length-fix`. Never do your work directly on `maint` or `master`. ## Fixing a bug @@ -108,6 +109,7 @@ conflicts or include the latest changes. compiled and that it works. * Check for unnecessary whitespace before committing with `git diff --check`. +However, do not fix preexisting whitespace errors in otherwise untouched source lines. Check your coding style: diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml index 0fff8f7cad..a20b8ee884 100644 --- a/erts/doc/src/erl_nif.xml +++ b/erts/doc/src/erl_nif.xml @@ -1250,8 +1250,9 @@ typedef struct { <fsummary>Format strings and Erlang terms.</fsummary> <desc> <p>Similar to <c>fprintf</c> but this format string also accepts - <c>"%T"</c>, which formats Erlang terms.</p> - <p>This function was originally intenden for debugging purpose. It is not + <c>"%T"</c>, which formats Erlang terms of type + <seealso marker="#ERL_NIF_TERM"><c>ERL_NIF_TERM</c></seealso>.</p> + <p>This function is primarily intenden for debugging purpose. It is not recommended to print very large terms with <c>%T</c>. The function may change <c>errno</c>, even if successful.</p> </desc> @@ -3191,8 +3192,9 @@ if (retval & ERL_NIF_SELECT_STOP_CALLED) { <fsummary>Format strings and Erlang terms.</fsummary> <desc> <p>Similar to <c>snprintf</c> but this format string also accepts - <c>"%T"</c>, which formats Erlang terms.</p> - <p>This function was originally intenden for debugging purpose. It is not + <c>"%T"</c>, which formats Erlang terms of type + <seealso marker="#ERL_NIF_TERM"><c>ERL_NIF_TERM</c></seealso>.</p> + <p>This function is primarily intenden for debugging purpose. It is not recommended to print very large terms with <c>%T</c>. The function may change <c>errno</c>, even if successful.</p> </desc> |