diff options
author | Björn-Egil Dahlberg <[email protected]> | 2015-11-09 12:04:26 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2015-11-09 12:04:26 +0100 |
commit | ce4ba8d71fe41fa827f35f8c75917d76125fa8ab (patch) | |
tree | b35e0b8b61f99a878d384d57f3cb5e752913e025 /lib/kernel/doc/src/code.xml | |
parent | 6f760fcaf2608cc25684e17660a95e51f080c7af (diff) | |
parent | aed947dafb4f98bd1d770cbc63d87b3c93964f46 (diff) | |
download | otp-ce4ba8d71fe41fa827f35f8c75917d76125fa8ab.tar.gz otp-ce4ba8d71fe41fa827f35f8c75917d76125fa8ab.tar.bz2 otp-ce4ba8d71fe41fa827f35f8c75917d76125fa8ab.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/doc/src/code.xml')
-rw-r--r-- | lib/kernel/doc/src/code.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml index 4e3be35079..eb0f4b7a06 100644 --- a/lib/kernel/doc/src/code.xml +++ b/lib/kernel/doc/src/code.xml @@ -230,7 +230,7 @@ <c>-code_path_choice Choice</c>. If the flag is set to <c>relaxed</c>, the code server will instead choose a suitable directory depending on the actual file structure. If there exists a regular - application ebin directory,situation it will be chosen. But if it does + application ebin directory, it will be chosen. But if it does not exist, the ebin directory in the archive is chosen if it exists. If neither of them exists the original directory will be chosen.</p> @@ -282,9 +282,9 @@ <p>From the R12B release, functions in this module will generally fail with an exception if they are passed an incorrect type (for instance, an integer or a tuple - where an atom was expected). An error tuple will be returned if type of argument + where an atom was expected). An error tuple will be returned if the type of the argument was correct, but there was some other error (for instance, a non-existing directory - given to <c>set_path/1</c>.</p> + was given to <c>set_path/1</c>).</p> </section> <datatypes> |