Merge pull request #1781 from madsmtm/apple-target-env-abi

Add `target_env = "macabi"` and `target_env = "sim"`

Author: ehuss

src/conditional-compilation.md

@@ -202,17 +202,19 @@ Example values:
 * `"msvc"`
 * `"musl"`
 * `"sgx"`
+* `"sim"`
+* `"macabi"`
 
 r[cfg.target_abi]
 ### `target_abi`
 
 r[cfg.target_abi.general]
-Key-value option set to further disambiguate the `target_env` with information
-about the target ABI.
+Key-value option set to further disambiguate the target with information about
+the target ABI.
 
 r[cfg.target_abi.disambiguation]
 For historical reasons, this value is only defined as not the empty-string when actually
- needed for disambiguation. Thus, for example, on many GNU platforms, this value will be
+needed for disambiguation. Thus, for example, on many GNU platforms, this value will be
 empty.
 
 r[cfg.target_abi.values]
@@ -222,8 +224,6 @@ Example values:
 * `"llvm"`
 * `"eabihf"`
 * `"abi64"`
-* `"sim"`
-* `"macabi"`
 
 r[cfg.target_endian]
 ### `target_endian`