Merge pull request #28862 from veprbl/doc_fix

small documentation fixes

authored by Jörg Thalheim and committed by GitHub 38311727 189797c7

+6 -6
+1 -1
.github/CONTRIBUTING.md
··· 23 23 Examples: 24 24 25 25 * nginx: init at 2.0.1 26 - * firefox: 3.0 -> 3.1.1 26 + * firefox: 54.0.1 -> 55.0 27 27 * nixos/hydra: add bazBaz option 28 28 29 29 Dual baz behavior is needed to do foo.
+2 -2
doc/coding-conventions.xml
··· 365 365 <varlistentry> 366 366 <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term> 367 367 <listitem> 368 - <para>(A tool is a relatively small program, especially one intented 368 + <para>(A tool is a relatively small program, especially one intended 369 369 to be used non-interactively.)</para> 370 370 <variablelist> 371 371 <varlistentry> ··· 608 608 </section> 609 609 <section xml:id="sec-sources"><title>Fetching Sources</title> 610 610 <para>There are multiple ways to fetch a package source in nixpkgs. The 611 - general guidline is that you should package sources with a high degree of 611 + general guideline is that you should package sources with a high degree of 612 612 availability. Right now there is only one fetcher which has mirroring 613 613 support and that is <literal>fetchurl</literal>. Note that you should also 614 614 prefer protocols which have a corresponding proxy environment variable.
+1 -1
doc/languages-frameworks/python.md
··· 590 590 e.g. the test runner, should be added to `buildInputs`. 591 591 592 592 By default `meta.platforms` is set to the same value 593 - as the interpreter unless overriden otherwise. 593 + as the interpreter unless overridden otherwise. 594 594 595 595 ##### `buildPythonPackage` parameters 596 596
+1 -1
doc/languages-frameworks/rust.md
··· 17 17 `nix-shell -p rustStable.rustc -p rustStable.cargo`. 18 18 19 19 There are also `rustBeta` and `rustNightly` package sets available. 20 - These are not updated very regulary. For daily builds use either rustup from 20 + These are not updated very regularly. For daily builds use either rustup from 21 21 nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). 22 22 23 23 ## Packaging Rust applications
+1 -1
doc/submitting-changes.xml
··· 78 78 79 79 <listitem> 80 80 <para> 81 - <command>firefox: 3.0 -> 3.1.1</command> 81 + <command>firefox: 54.0.1 -> 55.0</command> 82 82 </para> 83 83 </listitem> 84 84