diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b77ca7eefb9..f7fac647f41 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,7 +23,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. Examples: * nginx: init at 2.0.1 - * firefox: 3.0 -> 3.1.1 + * firefox: 54.0.1 -> 55.0 * nixos/hydra: add bazBaz option Dual baz behavior is needed to do foo. diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 0457018f7d0..0776e70f14e 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -365,7 +365,7 @@ splitting up an existing category. If it’s a (set of) tool(s): - (A tool is a relatively small program, especially one intented + (A tool is a relatively small program, especially one intended to be used non-interactively.) @@ -608,7 +608,7 @@ evaluate correctly.
Fetching Sources There are multiple ways to fetch a package source in nixpkgs. The - general guidline is that you should package sources with a high degree of + general guideline is that you should package sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is fetchurl. Note that you should also prefer protocols which have a corresponding proxy environment variable. diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index c57fd4aec17..f2de0225b1d 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -590,7 +590,7 @@ By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `buildInputs`. By default `meta.platforms` is set to the same value -as the interpreter unless overriden otherwise. +as the interpreter unless overridden otherwise. ##### `buildPythonPackage` parameters diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index ef6ebc392b3..481b76fb78f 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -17,7 +17,7 @@ into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustStable.rustc -p rustStable.cargo`. There are also `rustBeta` and `rustNightly` package sets available. -These are not updated very regulary. For daily builds use either rustup from +These are not updated very regularly. For daily builds use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). ## Packaging Rust applications diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index c8742a083c3..342941a442a 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -78,7 +78,7 @@ Additional information. -firefox: 3.0 -> 3.1.1 +firefox: 54.0.1 -> 55.0