diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 84a92872d0b..41f010d10b3 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -144,7 +144,7 @@ networking.wireless.enable = true;
NixOS currently does not generate wpa_supplicant's
configuration file, /etc/wpa_supplicant.conf. You should edit this file
-ourself to define wireless networks, WPA keys and so on (see
+yourself to define wireless networks, WPA keys and so on (see
wpa_supplicant.conf(5)).
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 95c1848e387..50ce2a2dcb7 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -65,7 +65,7 @@ $ nixos-rebuild switch -I /my/sources
directory
A module is a file which handles one specific part of the
- configuration. This part of the configuration could correspond to an
+ configuration. This part of the configuration could correspond to
hardware, a service, network settings, or preferences. A module
configuration does not have to handle everything from scratch, it can base
its configuration on other configurations provided by other modules. Thus
@@ -321,7 +321,7 @@ where attr is an attribute in
-Most parts of NixOS can be build through the config
+Most parts of NixOS can be built through the config
attribute set. This attribute set allows you to have a view of the merged
option definitions and all its derivations. Important derivations are store
inside the option and can be listed with the
@@ -341,7 +341,7 @@ config.system.build
Building a NixOS CD is as easy as configuring your own computer. The
idea is to use another module which will replace
your configuration.nix to configure the system that
-would be install on the CD.
+would be installed on the CD.Default CD/DVD configurations are available
inside nixos/modules/installer/cd-dvd. To build them
diff --git a/doc/manual/running.xml b/doc/manual/running.xml
index 57206bbce8f..ac3ce40339d 100644
--- a/doc/manual/running.xml
+++ b/doc/manual/running.xml
@@ -19,7 +19,7 @@ the systemd program. Systemd is the “init” process of the system
so-called “units”, which can be things like system services
(programs), but also mount points, swap files, devices, targets
(groups of units) and more. Units can have complex dependencies; for
-instance, one unit can require that another unit must be succesfully
+instance, one unit can require that another unit must be successfully
started before the first unit can be started. When the system boots,
it starts a unit named default.target; the
dependencies of this unit cause all system services to be started,
@@ -122,7 +122,7 @@ authentication.Systemd keeps track of all users who are logged into the system
(e.g. on a virtual console or remotely via SSH). The command
-loginctl allows quering and manipulating user
+loginctl allows querying and manipulating user
sessions. For instance, to list all user sessions:
diff --git a/modules/config/gnu.nix b/modules/config/gnu.nix
index 5c84d90932a..1a69083a206 100644
--- a/modules/config/gnu.nix
+++ b/modules/config/gnu.nix
@@ -7,7 +7,7 @@ with pkgs.lib;
gnu = mkOption {
default = false;
description =
- '' When enable, GNU software is chosent by default whenever a there is
+ '' When enabled, GNU software is chosen by default whenever a there is
a choice between GNU and non-GNU software (e.g., GNU lsh
vs. OpenSSH).
'';
diff --git a/modules/config/pulseaudio.nix b/modules/config/pulseaudio.nix
index 696f0dc1067..26060f5b2d1 100644
--- a/modules/config/pulseaudio.nix
+++ b/modules/config/pulseaudio.nix
@@ -58,7 +58,7 @@ in {
description = ''
If false, a PulseAudio server is launched automatically for
each user that tries to use the sound system. The server runs
- with user priviliges. This is the recommended and most secure
+ with user privileges. This is the recommended and most secure
way to use PulseAudio. If true, one system-wide PulseAudio
server is launched on boot, running as the user "pulse".
Please read the PulseAudio documentation for more details.
diff --git a/modules/hardware/cpu/amd-microcode.nix b/modules/hardware/cpu/amd-microcode.nix
index 2b224e04f2d..350bcb74885 100644
--- a/modules/hardware/cpu/amd-microcode.nix
+++ b/modules/hardware/cpu/amd-microcode.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
default = false;
type = types.bool;
description = ''
- Update the CPU microcode for Amd processors.
+ Update the CPU microcode for AMD processors.
'';
};
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 18139b57fdb..922bbb53171 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -1,5 +1,5 @@
# This module defines the global list of uids and gids. We keep a
-# central list to prevent id collissions.
+# central list to prevent id collisions.
{config, pkgs, ...}:
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 03979e259bf..0df0e57c98e 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -54,7 +54,7 @@ in
globally through the packageOverrides
option. The latter is a function that takes as an argument
the original Nixpkgs, and must evaluate
- to a set of new or overriden packages.
+ to a set of new or overridden packages.
'';
};
diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh
index b7c139416c0..98b0907a06b 100644
--- a/modules/programs/bash/bashrc.sh
+++ b/modules/programs/bash/bashrc.sh
@@ -7,7 +7,7 @@ if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi
__ETC_BASHRC_SOURCED=1
# If the profile was not loaded in a parent process, source it. But
-# otherwise don't do it because we don't want to clobber overriden
+# otherwise don't do it because we don't want to clobber overridden
# values of $PATH, etc.
if [ -z "$__ETC_PROFILE_DONE" ]; then
. /etc/profile
diff --git a/modules/programs/blcr.nix b/modules/programs/blcr.nix
index d1cc40585bb..e1e31b4a56a 100644
--- a/modules/programs/blcr.nix
+++ b/modules/programs/blcr.nix
@@ -13,7 +13,7 @@ in
environment.blcr.enable = mkOption {
default = false;
description =
- "Wheter to enable support for the BLCR checkpointing tool.";
+ "Whether to enable support for the BLCR checkpointing tool.";
};
};
diff --git a/modules/security/polkit.nix b/modules/security/polkit.nix
index fef52f1fed6..b9b32496a36 100644
--- a/modules/security/polkit.nix
+++ b/modules/security/polkit.nix
@@ -44,7 +44,7 @@ in
'';
description =
''
- Allows the default permissions of privileged actions to be overriden.
+ Allows the default permissions of privileged actions to be overridden.
'';
};
@@ -55,7 +55,7 @@ in
''
Specifies which users are considered “administrators”, for those
actions that require the user to authenticate as an
- administrator (i.e. have a auth_admin
+ administrator (i.e. have an auth_admin
value). By default, this is the root
user and all users in the wheel group.
'';
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index a81376517eb..e75679e5ff6 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -47,7 +47,7 @@ in
];
description = ''
This option allows the ownership and permissions on the setuid
- wrappers for specific programs to be overriden from the
+ wrappers for specific programs to be overridden from the
default (setuid root, but not setgid root).
'';
};
diff --git a/modules/services/amqp/activemq/default.nix b/modules/services/amqp/activemq/default.nix
index 0df79205d5a..44bf8be5878 100644
--- a/modules/services/amqp/activemq/default.nix
+++ b/modules/services/amqp/activemq/default.nix
@@ -55,7 +55,7 @@ in {
default = "/var/activemq";
description = ''
The base directory where ActiveMQ stores its persistent data and logs.
- This will be overriden if you set "activemq.base" and "activemq.data"
+ This will be overridden if you set "activemq.base" and "activemq.data"
in the javaProperties option. You can also override
this in activemq.xml.
'';
@@ -94,7 +94,7 @@ in {
type = types.bool;
default = true;
description = ''
- If true, the a system user with the specified name will be added
+ If true, a system user with the specified name will be added
to the system configuration. If false, a user with the specified
name is expected to exist.
'';
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index b61c8020bca..6a595f8306b 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -82,7 +82,7 @@ in
acEventCommands = mkOption {
default = "";
- description = "Shell commands to execute on a ac_adapter.* event.";
+ description = "Shell commands to execute on an ac_adapter.* event.";
};
};
diff --git a/modules/services/hardware/nvidia-optimus.nix b/modules/services/hardware/nvidia-optimus.nix
index 0ba4b2327e1..fd58b3d5ad5 100644
--- a/modules/services/hardware/nvidia-optimus.nix
+++ b/modules/services/hardware/nvidia-optimus.nix
@@ -13,7 +13,7 @@ in
default = false;
type = pkgs.lib.types.bool;
description = ''
- completely disable the nvidia gfx chip (saves power / heat) and just use IGP
+ Completely disable the nvidia gfx chip (saves power / heat) and just use IGP
'';
};
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 7a7462ecb39..d8573f30939 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -69,7 +69,7 @@ in
description = "
This option defines the maximum number of jobs that Nix will try
to build in parallel. The default is 1. You should generally
- set it to the number of CPUs in your system (e.g., 2 on a Athlon
+ set it to the number of CPUs in your system (e.g., 2 on an Athlon
64 X2).
";
};
@@ -114,14 +114,14 @@ in
nixos-rebuild --no-build-hook
or consider managing /etc/nix.machines manually
by setting . Then you can comment
- unavailable buildmachines.
+ unavailable build machines.
";
};
manualNixMachines = mkOption {
default = false;
description = "
- Whether to manually manage the list of buildmachines used in distributed
+ Whether to manually manage the list of build machines used in distributed
builds in /etc/nix.machines.
";
};
@@ -163,7 +163,7 @@ in
This option lists the machines to be used if distributed
builds are enabled (see
). Nix will perform
- derivations on those machines via SSh by copying the inputs
+ derivations on those machines via SSH by copying the inputs
to the Nix store on the remote machine, starting the build,
then copying the output back to the local Nix store. Each
element of the list should be an attribute set containing
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index a894c68112e..91c0acb0bc2 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -29,7 +29,7 @@ in
default = "";
description = "
use screen-name instead the hostname to identify
- ourselfs to the server.
+ ourselves to the server.
";
};
serverAddress = mkOption {
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index eedd69ac191..a7b72e53f0a 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -25,7 +25,7 @@ let
port = mkOption {
type = types.uniq types.string;
description = ''
- The serial port where your UPS is connected. /dev/ttyS0 is
+ The serial port to which your UPS is connected. /dev/ttyS0 is
usually the first port on Linux boxes, for example.
'';
};
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 761ddc08bf1..48803511a5e 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -80,9 +80,9 @@ in
networking.dhcpcd.denyInterfaces = mkOption {
default = [];
description = ''
- Disable the DHCP client for any interface which's name matches
+ Disable the DHCP client for any interface whose name matches
any of the shell glob patterns in this list. The purpose of
- this option is blacklist virtual interfaces such as those
+ this option is to blacklist virtual interfaces such as those
created by Xen, libvirt, LXC, etc.
'';
};
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 40fbbabed3f..25a832da7a4 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -97,7 +97,7 @@ in
description =
''
If set, forbidden packets are rejected rather than dropped
- (ignored). This means that a ICMP "port unreachable" error
+ (ignored). This means that an ICMP "port unreachable" error
message is sent back to the client. Rejecting packets makes
port scanning somewhat easier.
'';
@@ -170,7 +170,7 @@ in
List of connection-tracking helpers that are auto-loaded.
The complete list of possible values is given in the example.
- As helpers can pose as a security risk, it is adviced to
+ As helpers can pose as a security risk, it is advised to
set this to an empty list and disable the setting
networking.firewall.autoLoadConntrackHelpers
diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix
index bbc4d1f8cea..e78e276ff82 100644
--- a/modules/services/networking/networkmanager.nix
+++ b/modules/services/networking/networkmanager.nix
@@ -54,7 +54,7 @@ in {
default = false;
merge = mergeEnableOption;
description = ''
- Whether to use NetworkManager to obtain an IP adress and other
+ Whether to use NetworkManager to obtain an IP address and other
configuration for all network interfaces that are not manually
configured. If enabled, a group networkmanager
will be created. Add all users that should have permission
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index c7b9ec27737..e2cfc5cdb26 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -639,7 +639,7 @@ in
# Get rid of old semaphores. These tend to accumulate across
# server restarts, eventually preventing it from restarting
- # succesfully.
+ # successfully.
for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do
${pkgs.utillinux}/bin/ipcrm -s $i
done
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index f0c5322386c..6d804c13827 100644
--- a/modules/services/x11/desktop-managers/kde4.nix
+++ b/modules/services/x11/desktop-managers/kde4.nix
@@ -77,7 +77,7 @@ in
config = mkIf (xcfg.enable && cfg.enable) {
# If KDE 4 is enabled, make it the default desktop manager (unless
- # overriden by the user's configuration).
+ # overridden by the user's configuration).
# !!! doesn't work yet ("Multiple definitions. Only one is allowed
# for this option.")
# services.xserver.desktopManager.default = mkOverrideTemplate 900 "kde4";
diff --git a/modules/system/boot/loader/generations-dir/generations-dir.nix b/modules/system/boot/loader/generations-dir/generations-dir.nix
index 8184b9c0a98..b14f81552ee 100644
--- a/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -31,7 +31,7 @@ let
default = false;
description = "
Whether copy the necessary boot files into /boot, so
- /nix/store is not needed by the boot loadear.
+ /nix/store is not needed by the boot loader.
";
};
};
diff --git a/modules/system/boot/loader/init-script/init-script.nix b/modules/system/boot/loader/init-script/init-script.nix
index ef5e97eb2c9..4b0fcd85b4b 100644
--- a/modules/system/boot/loader/init-script/init-script.nix
+++ b/modules/system/boot/loader/init-script/init-script.nix
@@ -28,10 +28,10 @@ in
Or having it makes starting NixOS easier.
This applies to some kind of hosting services and user mode linux.
- Additionaly this script will create
+ Additionally this script will create
/boot/init-other-configurations-contents.txt containing
contents of remaining configurations. You can copy paste them into
- /sbin/init manually running a recue system or such.
+ /sbin/init manually running a rescue system or such.
'';
};
};
diff --git a/modules/system/boot/systemd-unit-options.nix b/modules/system/boot/systemd-unit-options.nix
index f863daf2250..fd4d19d1dd0 100644
--- a/modules/system/boot/systemd-unit-options.nix
+++ b/modules/system/boot/systemd-unit-options.nix
@@ -118,7 +118,7 @@ rec {
default = {};
type = types.attrs;
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
- description = "Environment variables passed to the services's processes.";
+ description = "Environment variables passed to the service's processes.";
};
path = mkOption {
diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 077d6a4471a..590eb002022 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -29,7 +29,7 @@ in
ZFS uses a system's hostid to determine if a storage pool (zpool) is
native to this system, and should thus be imported automatically.
Unfortunately, this hostid can change under linux from boot to boot (by
- changing network adapaters, for instance). Specify a unique 32 bit hostid in
+ changing network adapters, for instance). Specify a unique 32 bit hostid in
hex here for zfs to prevent getting a random hostid between boots and having to
manually import pools.
'';
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 75f2e1af4be..0177d6396df 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -223,7 +223,7 @@ in
default = true;
merge = mergeEnableOption;
description = ''
- Whether to use DHCP to obtain an IP adress and other
+ Whether to use DHCP to obtain an IP address and other
configuration for all network interfaces that are not manually
configured.
'';
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 13ffbc7a51a..4ab67aee395 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -12,7 +12,7 @@ with pkgs.lib;
example = "min_power";
type = types.uniq types.string;
description = ''
- Configure the scsi link power management policy. By default,
+ Configure the SCSI link power management policy. By default,
the kernel configures "max_performance".
'';
};
diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix
index 26904c78ae9..aae2c279b1e 100644
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@@ -15,13 +15,13 @@ let
specificThemes = config.services.ttyBackgrounds.specificThemes;
- overridenTTYs = map (x: x.tty) specificThemes;
+ overriddenTTYs = map (x: x.tty) specificThemes;
# Use the default theme for all the mingetty ttys and for the
# syslog tty, except those for which a specific theme is
# specified.
defaultTTYs =
- filter (x: !(elem x overridenTTYs)) requiredTTYs;
+ filter (x: !(elem x overriddenTTYs)) requiredTTYs;
in
(map (tty: { inherit tty; }) defaultTTYs) ++ specificThemes;