diff --git a/doc/configuration.xml b/doc/configuration.xml index 56950e07ab5..ea3acf4e575 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -227,7 +227,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.config/nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix 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 4e7159638ca..4a9015602af 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -70,7 +70,7 @@ In the above example, the separateDebugInfo attribute is - overriden to be true, thus building debug info for + overridden to be true, thus building debug info for helloWithDebug, while all other attributes will be retained from the original hello package. diff --git a/doc/overlays.xml b/doc/overlays.xml index 4b95f3e7288..f8f554bb556 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -78,7 +78,7 @@ self: super: The first argument, usually named self, 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 rr in the example above come -from self, as well as the overriden dependencies used in the +from self, as well as the overridden dependencies used in the boost override. The second argument, usually named super, diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index f86928bcd5d..0813e0968e8 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -18,7 +18,7 @@ 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 most recently and the s1 s2 - Replace every occurence of the string + Replace every occurrence of the string s1 by s2. @@ -1164,7 +1164,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello varName - Replace every occurence of + Replace every occurrence of @varName@ by the contents of the environment variable varName. This is useful for @@ -1177,7 +1177,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello varName s - Replace every occurence of + Replace every occurrence of @varName@ by the string s. @@ -1225,7 +1225,7 @@ substitute ./foo.in ./foo.out \ substituteAll infile outfile - Replaces every occurence of + Replaces every occurrence of @varName@, where varName is any environment variable, in infile, 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. - Addtionally, some warnings are enabled which might trigger build + 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 to . @@ -1558,7 +1558,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro pic Adds the 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. Most notably, the Linux kernel, kernel modules and other code not running in an operating system environment like boot loaders won't diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 9851eb08afb..d5d8140e076 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -57,7 +57,7 @@ Thus, if something went wrong, you can get status info using -If the container has started succesfully, you can log in as +If the container has started successfully, you can log in as root using the root-login operation: diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index e322b6458a1..d20c2d1aa2e 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -96,7 +96,7 @@ options = { - Both approachs have problems. + Both approaches have problems. Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index e928c557087..441393c9827 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -396,7 +396,7 @@ code before creating a new type. For composed types that can take a submodule as type 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 - 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 substSubModules, e.g for a type composedType that take an elemtype diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index e0271485c36..967fbcf869d 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -342,7 +342,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc - 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). diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index f460e00e836..7279dd05827 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -362,7 +362,7 @@ services.syncthing = { networking.firewall.allowPing 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 /proc/sys/net/ipv4/icmp_ratelimit and /proc/sys/net/ipv6/icmp/ratelimit or using the