about summary refs log tree commit diff
path: root/src/doc/reference.md
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-07 00:02:18 +0000
committerbors <bors@rust-lang.org>2014-11-07 00:02:18 +0000
commit45cbdec4174778bf915f17561ef971c068a7fcbc (patch)
tree9516c60b7323f1233858665501a5029c9c3f90f0 /src/doc/reference.md
parent8ed288edb27fc83b15a549af69c82b5bb4f8ac1e (diff)
parentd27039d701a3c6e97f19e41436d06ed42c0f5f8a (diff)
downloadrust-45cbdec4174778bf915f17561ef971c068a7fcbc.tar.gz
rust-45cbdec4174778bf915f17561ef971c068a7fcbc.zip
auto merge of #18719 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/doc/reference.md')
-rw-r--r--src/doc/reference.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index 96d6bece230..1c338aa8118 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -1961,8 +1961,10 @@ On an `extern` block, the following attributes are interpreted:
   name and type. This is feature gated and the exact behavior is
   implementation-defined (due to variety of linker invocation syntax).
 - `link` - indicate that a native library should be linked to for the
-  declarations in this block to be linked correctly. See [external
-  blocks](#external-blocks)
+  declarations in this block to be linked correctly. `link` supports an optional `kind`
+  key with three possible values: `dylib`, `static`, and `framework`. See [external blocks](#external-blocks) for more about external blocks. Two
+  examples: `#[link(name = "readline")]` and
+  `#[link(name = "CoreFoundation", kind = "framework")]`.
 
 On declarations inside an `extern` block, the following attributes are
 interpreted: