minor doc cleanup

Sacha0 · Mar 9, 2015 · c26bccf · c26bccf
1 parent 0e9704e
commit c26bccf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -27,6 +27,10 @@ for exceptions.
 > OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 > WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Julia includes code from the following projects, which have their own licenses:
+- [LDC](https://github.com/ldc-developers/ldc/blob/master/LICENSE) (for ccall/cfunction ABI definitions)
+- [MUSL](https://git.musl-libc.org/cgit/musl/tree/COPYRIGHT) (for getopt implementations on Windows)
+- [NetBSD](https://www.netbsd.org/about/redistribution.html) (for setjmp/longjmp implementations on Windows)
 
 The Julia language links to the following external libraries, which have their
 own licenses:
@@ -52,7 +56,6 @@ their own licenses:
 - [GMP](https://gmplib.org/manual/Copying.html#Copying)
 - [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING)
 - [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying)
-- [MUSL](https://git.musl-libc.org/cgit/musl/tree/COPYRIGHT)
 - [OPENBLAS](https://raw.github.com/xianyi/OpenBLAS/master/LICENSE)
 - [LAPACK](https://netlib.org/lapack/LICENSE.txt)
 - [PCRE](https://www.pcre.org/licence.txt)
@@ -70,7 +73,6 @@ The following components of Julia's standard library have separate licenses:
 Julia builds the following libraries by default, but does not use them itself:
 
 - [RMATH](https://www.r-project.org/Licenses/)
-- [LDC](https://github.com/ldc-developers/ldc/blob/master/LICENSE)
 
 
 Julia's build process uses the following external tools:

diff --git a/doc/manual/calling-c-and-fortran-code.rst b/doc/manual/calling-c-and-fortran-code.rst
@@ -152,11 +152,14 @@ uninitialized array and passing a pointer to its data to the C function.
 Creating C-Compatible Julia Function Pointers
 ---------------------------------------------
 
-It is possible to pass Julia functions to native functions that accept function
-pointer arguments by creating function pointers via the `cfunction` function.
+It is possible to pass Julia functions to native c-functions that accept
+function pointer arguments. For example, to match c-prototypes of the form::
 
-Finally, you can use ``cfunction`` to actually generate a call to the
-Julia library function. Arguments to ``cfunction`` are as follows:
+ typedef returntype (*functiontype)(argumenttype,...)
+
+The function `cfunction` generates the c-compatible function pointer for
+a call to a Julia Julia library function.
+Arguments to ``cfunction`` are as follows:
 
 1. A Julia Function