Merge pull request rust-lang#171 from pietroalbini/small-fixes

Random fixes

Author: pietroalbini

bibliography.md

@@ -65,9 +65,7 @@ Language](http://www.cs.indiana.edu/~eholk/papers/hips2013.pdf). Early GPU work
 * [Reenix: Implementing a Unix-Like Operating System in
   Rust](http://scialex.github.io/reenix.pdf). Undergrad paper by Alex
   Light.
-* [Evaluation of performance and productivity metrics of potential
-  programming languages in the HPC environment]
-  (http://octarineparrot.com/assets/mrfloya-thesis-ba.pdf).
+* [Evaluation of performance and productivity metrics of potential programming languages in the HPC environment](http://octarineparrot.com/assets/mrfloya-thesis-ba.pdf).
   Bachelor's thesis by Florian Wilkens. Compares C, Go and Rust.
 * [Nom, a byte oriented, streaming, zero copy, parser combinators library
   in Rust](http://spw15.langsec.org/papers/couprie-nom.pdf). By

feature-guide.md

@@ -114,10 +114,7 @@ In order to implement a new unstable feature, you need to do the following steps
     
     The current version is not actually important – the important version is when you are *stabilizing* a feature.
 4. Prevent usage of the new feature unless the feature gate is set.  
-    You can check it in most places in the compiler using the expression  
-    ```
-    tcx.sess.features().borrow().$feature_name
-    ```
+    You can check it in most places in the compiler using the expression `tcx.features().$feature_name` (or `sess.features_untracked().borrow().$feature_name` if the tcx is unavailable)
     
     If the feature gate is not set, you should either maintain the pre-feature behavior or raise an error, depending on what makes sense.
 5. Add a test to ensure the feature cannot be used without a feature gate, by creating `feature-gate-$feature_name.rs` and `feature-gate-$feature_name.stderr` fiels under the `src/test/ui/feature-gates` directory.