about summary refs log tree commit diff
path: root/src/doc/trpl
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-07 02:46:43 +0000
committerbors <bors@rust-lang.org>2015-08-07 02:46:43 +0000
commit871fd5eb73828561c07fd0f9d44a341b87c59f52 (patch)
tree3db8eb182b4b08823584cfac4aa14fdd7bdf1b6e /src/doc/trpl
parent1181679c8f84f8ca1c70b60d63ee88336ac363dd (diff)
parent3653cd95556ecb078f2c685ab380874d1b46eaf2 (diff)
downloadrust-871fd5eb73828561c07fd0f9d44a341b87c59f52.tar.gz
rust-871fd5eb73828561c07fd0f9d44a341b87c59f52.zip
Auto merge of #27552 - tshepang:misc, r=brson
Diffstat (limited to 'src/doc/trpl')
-rw-r--r--src/doc/trpl/advanced-linking.md13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/doc/trpl/advanced-linking.md b/src/doc/trpl/advanced-linking.md
index 6d370433542..8b8bbc20fcb 100644
--- a/src/doc/trpl/advanced-linking.md
+++ b/src/doc/trpl/advanced-linking.md
@@ -38,12 +38,12 @@ Static linking refers to the process of creating output that contain all
 required libraries and so don't need libraries installed on every system where
 you want to use your compiled project. Pure-Rust dependencies are statically
 linked by default so you can use created binaries and libraries without
-installing the Rust everywhere. By contrast, native libraries
-(e.g. `libc` and `libm`) usually dynamically linked, but it is possible to
+installing Rust everywhere. By contrast, native libraries
+(e.g. `libc` and `libm`) are usually dynamically linked, but it is possible to
 change this and statically link them as well.
 
-Linking is a very platform dependent topic — on some platforms, static linking
-may not be possible at all! This section assumes some basic familiarity with
+Linking is a very platform-dependent topic, and static linking may not even be
+possible on some platforms! This section assumes some basic familiarity with
 linking on your platform of choice.
 
 ## Linux
@@ -71,8 +71,7 @@ Dynamic linking on Linux can be undesirable if you wish to use new library
 features on old systems or target systems which do not have the required
 dependencies for your program to run.
 
-Static linking is supported via an alternative `libc`, `musl` - this must be
-enabled at Rust compile-time with some prerequisites available. You can compile
+Static linking is supported via an alternative `libc`, `musl`. You can compile
 your own version of Rust with `musl` enabled and install it into a custom
 directory with the instructions below:
 
@@ -123,7 +122,7 @@ $ du -h musldist/bin/rustc
 ```
 
 You now have a build of a `musl`-enabled Rust! Because we've installed it to a
-custom prefix we need to make sure our system can the binaries and appropriate
+custom prefix we need to make sure our system can find the binaries and appropriate
 libraries when we try and run it:
 
 ```text