Merge branch 'master' into version_ids

diff --cc clippy_lints/src/utils/mod.rs
index 3a16c6a892bedd2d9e089797404f40d551400c27,f7fbd5edb526965295c4ef4d7a00c788c5870fb0..6e81f3d0199661650e06b01e90fa68bbc73a8774
--- 1/clippy_lints/src/utils/mod.rs
--- 2/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@@ -539,11 -539,8 +539,11 @@@ impl<'a> DiagnosticWrapper<'a> 
      fn docs_link(&mut self, lint: &'static Lint) {
          if env::var("CLIPPY_DISABLE_DOCS_LINKS").is_err() {
              self.0.help(&format!(
-                 "for further information visit https://rust-lang-nursery.github.io/rust-clippy/{}/index.html#{}",
 -                "for further information visit https://rust-lang.github.io/rust-clippy/v{}/index.html#{}",
 -                env!("CARGO_PKG_VERSION"),
++                "for further information visit https://rust-lang.github.io/rust-clippy/{}/index.html#{}",
 +                &option_env!("RUST_RELEASE_NUM").map_or("master".to_string(), |n| {
 +                    // extract just major + minor version and ignore patch versions
 +                    format!("rust-{}", n.rsplitn(2, '.').nth(1).unwrap())
 +                }),
                  lint.name_lower().replacen("clippy::", "", 1)
              ));
          }