Merge pull request rust-lang#2560 from Havvy/patch-3

cfg-attr-multi: Fix typo
RalfJung · Oct 9, 2018 · eecc3f5 · eecc3f5
2 parents cbbc5a7 + 38e3f51
commit eecc3f5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/text/2539-cfg_attr-multiple-attrs.md b/text/2539-cfg_attr-multiple-attrs.md
@@ -102,7 +102,7 @@ fn bewitche() {}
 Note: The `cfg_attr` can expand to another `cfg_attr`. For example,
 `#[cfg_attr(linux, cfg_attr(feature = "multithreaded", some_other_attribute))`
 is valid. This example would be equivalent to
-`#[cfg_attr(and(linux, feaure ="multithreaded"), some_other_attribute)]`.
+`#[cfg_attr(all(linux, feaure ="multithreaded"), some_other_attribute)]`.
 
 ## Warning When Zero Attributes