doc: Fix some typos

This commit is contained in:
Jan Tojnar 2017-06-11 22:12:59 +02:00
parent 4010313ab9
commit e35f3c0679
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
10 changed files with 15 additions and 15 deletions

View File

@ -227,7 +227,7 @@ packages via <literal>packageOverrides</literal></title>
<para>You can define a function called <para>You can define a function called
<varname>packageOverrides</varname> in your local <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 must be a function that takes pkgs as an argument and return modified
set of packages. set of packages.

View File

@ -70,7 +70,7 @@
<para> <para>
In the above example, the <varname>separateDebugInfo</varname> attribute is 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 <varname>helloWithDebug</varname>, while all other attributes will be
retained from the original <varname>hello</varname> package. retained from the original <varname>hello</varname> package.
</para> </para>

View File

@ -78,7 +78,7 @@ self: super:
<para>The first argument, usually named <varname>self</varname>, corresponds to the final package <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 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 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> <varname>boost</varname> override.</para>
<para>The second argument, usually named <varname>super</varname>, <para>The second argument, usually named <varname>super</varname>,

View File

@ -18,7 +18,7 @@
<para>The high change rate of nixpkgs make any pull request that is open for <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 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 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 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 xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
recently</link> and the <link recently</link> and the <link

View File

@ -1156,7 +1156,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
<term><option>--replace</option> <term><option>--replace</option>
<replaceable>s1</replaceable> <replaceable>s1</replaceable>
<replaceable>s2</replaceable></term> <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>s1</replaceable> by
<replaceable>s2</replaceable>.</para></listitem> <replaceable>s2</replaceable>.</para></listitem>
</varlistentry> </varlistentry>
@ -1164,7 +1164,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
<varlistentry> <varlistentry>
<term><option>--subst-var</option> <term><option>--subst-var</option>
<replaceable>varName</replaceable></term> <replaceable>varName</replaceable></term>
<listitem><para>Replace every occurence of <listitem><para>Replace every occurrence of
<literal>@<replaceable>varName</replaceable>@</literal> by <literal>@<replaceable>varName</replaceable>@</literal> by
the contents of the environment variable the contents of the environment variable
<replaceable>varName</replaceable>. This is useful for <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> <term><option>--subst-var-by</option>
<replaceable>varName</replaceable> <replaceable>varName</replaceable>
<replaceable>s</replaceable></term> <replaceable>s</replaceable></term>
<listitem><para>Replace every occurence of <listitem><para>Replace every occurrence of
<literal>@<replaceable>varName</replaceable>@</literal> by <literal>@<replaceable>varName</replaceable>@</literal> by
the string <replaceable>s</replaceable>.</para></listitem> the string <replaceable>s</replaceable>.</para></listitem>
</varlistentry> </varlistentry>
@ -1225,7 +1225,7 @@ substitute ./foo.in ./foo.out \
<term><function>substituteAll</function> <term><function>substituteAll</function>
<replaceable>infile</replaceable> <replaceable>infile</replaceable>
<replaceable>outfile</replaceable></term> <replaceable>outfile</replaceable></term>
<listitem><para>Replaces every occurence of <listitem><para>Replaces every occurrence of
<literal>@<replaceable>varName</replaceable>@</literal>, where <literal>@<replaceable>varName</replaceable>@</literal>, where
<replaceable>varName</replaceable> is any environment variable, in <replaceable>varName</replaceable> is any environment variable, in
<replaceable>infile</replaceable>, writing the result to <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. depends on such a format string, it will need to be worked around.
</para> </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. failures if compiler warnings are treated as errors in the package build.
In this case, set <option>NIX_CFLAGS_COMPILE</option> to In this case, set <option>NIX_CFLAGS_COMPILE</option> to
<option>-Wno-error=warning-type</option>.</para> <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> <term><varname>pic</varname></term>
<listitem> <listitem>
<para>Adds the <option>-fPIC</option> compiler options. This options adds <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> ASLR possible.</para>
<para>Most notably, the Linux kernel, kernel modules and other code <para>Most notably, the Linux kernel, kernel modules and other code
not running in an operating system environment like boot loaders won't not running in an operating system environment like boot loaders won't

View File

@ -57,7 +57,7 @@ Thus, if something went wrong, you can get status info using
</para> </para>
<para>If the container has started succesfully, you can log in as <para>If the container has started successfully, you can log in as
root using the <command>root-login</command> operation: root using the <command>root-login</command> operation:
<screen> <screen>

View File

@ -96,7 +96,7 @@ options = {
</itemizedlist> </itemizedlist>
</para> </para>
<para>Both approachs have problems.</para> <para>Both approaches have problems.</para>
<para>Making backends independent can quickly become hard to manage. For <para>Making backends independent can quickly become hard to manage. For
display managers, there can be only one enabled at a time, but the type display managers, there can be only one enabled at a time, but the type

View File

@ -396,7 +396,7 @@ code before creating a new type.</para>
<listitem><para>For composed types that can take a submodule as type <listitem><para>For composed types that can take a submodule as type
parameter, this function can be used to substitute the parameter of a parameter, this function can be used to substitute the parameter of a
submodule type. It takes a module as parameter and return the type with submodule type. It takes a module as parameter and return the type with
the submodule options substituted. It is usally defined as a type the submodule options substituted. It is usually defined as a type
function call with a recursive call to function call with a recursive call to
<literal>substSubModules</literal>, e.g for a type <literal>substSubModules</literal>, e.g for a type
<literal>composedType</literal> that take an <literal>elemtype</literal> <literal>composedType</literal> that take an <literal>elemtype</literal>

View File

@ -342,7 +342,7 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
<listitem> <listitem>
<para> <para>
Python 2.6 has been marked as broken (as it no longer recieves Python 2.6 has been marked as broken (as it no longer receives
security updates from upstream). security updates from upstream).
</para> </para>
</listitem> </listitem>

View File

@ -362,7 +362,7 @@ services.syncthing = {
<listitem> <listitem>
<para> <para>
<literal>networking.firewall.allowPing</literal> is now enabled by <literal>networking.firewall.allowPing</literal> is now enabled by
default. Users are encourarged to configure an approiate rate limit for default. Users are encouraged to configure an appropriate rate limit for
their machines using the Kernel interface at their machines using the Kernel interface at
<filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
<filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the