diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-06-11 22:12:59 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-06-11 22:13:42 +0200 |
commit | e35f3c0679cafb8de84274433159e1b393dca46d (patch) | |
tree | 4c32df2d8b985aa0c8a2add597fa990688435295 /doc | |
parent | 4010313ab901c9022f564dfdc0e9ef27b595aa53 (diff) | |
download | nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar.gz nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar.bz2 nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar.lz nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar.xz nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.tar.zst nixlib-e35f3c0679cafb8de84274433159e1b393dca46d.zip |
doc: Fix some typos
Diffstat (limited to 'doc')
-rw-r--r-- | doc/configuration.xml | 2 | ||||
-rw-r--r-- | doc/functions.xml | 2 | ||||
-rw-r--r-- | doc/overlays.xml | 2 | ||||
-rw-r--r-- | doc/reviewing-contributions.xml | 2 | ||||
-rw-r--r-- | doc/stdenv.xml | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc/configuration.xml b/doc/configuration.xml index 56950e07ab5c..ea3acf4e5753 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -227,7 +227,7 @@ packages via <literal>packageOverrides</literal></title> <para>You can define a function called <varname>packageOverrides</varname> in your local -<filename>~/.config/nixpkgs/config.nix</filename> to overide nix packages. It +<filename>~/.config/nixpkgs/config.nix</filename> to override nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. diff --git a/doc/functions.xml b/doc/functions.xml index 4e7159638cae..4a9015602afc 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -70,7 +70,7 @@ <para> In the above example, the <varname>separateDebugInfo</varname> attribute is - overriden to be true, thus building debug info for + overridden to be true, thus building debug info for <varname>helloWithDebug</varname>, while all other attributes will be retained from the original <varname>hello</varname> package. </para> diff --git a/doc/overlays.xml b/doc/overlays.xml index 4b95f3e72880..f8f554bb5569 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -78,7 +78,7 @@ self: super: <para>The first argument, usually named <varname>self</varname>, corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of <varname>rr</varname> in the example above come -from <varname>self</varname>, as well as the overriden dependencies used in the +from <varname>self</varname>, as well as the overridden dependencies used in the <varname>boost</varname> override.</para> <para>The second argument, usually named <varname>super</varname>, diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f86928bcd5d0..0813e0968e86 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -18,7 +18,7 @@ <para>The high change rate of nixpkgs make any pull request that is open for long enough subject to conflicts that will require extra work from the submitter or the merger. Reviewing pull requests in a timely manner and being - responsive to the comments is the key to avoid these. Github provides sort + responsive to the comments is the key to avoid these. GitHub provides sort filters that can be used to see the <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most recently</link> and the <link diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a2530e102ca8..19bacd08f1ec 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1156,7 +1156,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <term><option>--replace</option> <replaceable>s1</replaceable> <replaceable>s2</replaceable></term> - <listitem><para>Replace every occurence of the string + <listitem><para>Replace every occurrence of the string <replaceable>s1</replaceable> by <replaceable>s2</replaceable>.</para></listitem> </varlistentry> @@ -1164,7 +1164,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <varlistentry> <term><option>--subst-var</option> <replaceable>varName</replaceable></term> - <listitem><para>Replace every occurence of + <listitem><para>Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the contents of the environment variable <replaceable>varName</replaceable>. This is useful for @@ -1177,7 +1177,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello <term><option>--subst-var-by</option> <replaceable>varName</replaceable> <replaceable>s</replaceable></term> - <listitem><para>Replace every occurence of + <listitem><para>Replace every occurrence of <literal>@<replaceable>varName</replaceable>@</literal> by the string <replaceable>s</replaceable>.</para></listitem> </varlistentry> @@ -1225,7 +1225,7 @@ substitute ./foo.in ./foo.out \ <term><function>substituteAll</function> <replaceable>infile</replaceable> <replaceable>outfile</replaceable></term> - <listitem><para>Replaces every occurence of + <listitem><para>Replaces every occurrence of <literal>@<replaceable>varName</replaceable>@</literal>, where <replaceable>varName</replaceable> is any environment variable, in <replaceable>infile</replaceable>, writing the result to @@ -1528,7 +1528,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': depends on such a format string, it will need to be worked around. </para> - <para>Addtionally, some warnings are enabled which might trigger build + <para>Additionally, some warnings are enabled which might trigger build failures if compiler warnings are treated as errors in the package build. In this case, set <option>NIX_CFLAGS_COMPILE</option> to <option>-Wno-error=warning-type</option>.</para> @@ -1558,7 +1558,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro <term><varname>pic</varname></term> <listitem> <para>Adds the <option>-fPIC</option> compiler options. This options adds - support for position independant code in shared libraries and thus making + support for position independent code in shared libraries and thus making ASLR possible.</para> <para>Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't |