MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #214 from ivan/typo-fix-1

Browse source 
Fix typos, especially those that end up in the NixOS manual
This commit is contained in:
Evgeny Egorochkin 2013-08-10 19:34:38 -07:00
commit c5d8db945e
30 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/configuration.xml
View file

@ -144,7 +144,7 @@ networking.wireless.enable = true;
NixOS currently does not generate wpa_supplicant's
configuration file, <literal>/etc/wpa_supplicant.conf</literal>. 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)).
</para>

6
doc/manual/development.xml
View file

@ -65,7 +65,7 @@ $ nixos-rebuild switch -I <replaceable>/my/sources</replaceable>
directory</para>
<para>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 <replaceable>attr</replaceable> is an attribute in
</para>
<para>
Most parts of NixOS can be build through the <varname>config</varname>
Most parts of NixOS can be built through the <varname>config</varname>
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 <option>system.build</option> and can be listed with the
@ -341,7 +341,7 @@ config.system.build</command>
<para>Building a NixOS CD is as easy as configuring your own computer. The
idea is to use another module which will replace
your <filename>configuration.nix</filename> to configure the system that
would be install on the CD.</para>
would be installed on the CD.</para>
<para>Default CD/DVD configurations are available
inside <filename>nixos/modules/installer/cd-dvd</filename>. To build them

4
doc/manual/running.xml
View file

@ -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 <literal>default.target</literal>; the
dependencies of this unit cause all system services to be started,
@ -122,7 +122,7 @@ authentication.</para>
<para>Systemd keeps track of all users who are logged into the system
(e.g. on a virtual console or remotely via SSH). The command
<command>loginctl</command> allows quering and manipulating user
<command>loginctl</command> allows querying and manipulating user
sessions. For instance, to list all user sessions:
<screen>

2
modules/config/gnu.nix
View file

@ -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).
'';

2
modules/config/pulseaudio.nix
View file

@ -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.

2
modules/hardware/cpu/amd-microcode.nix
View file

@ -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.
'';
};

2
modules/misc/ids.nix
View file

@ -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, ...}:

2
modules/misc/nixpkgs.nix
View file

@ -54,7 +54,7 @@ in
globally through the <varname>packageOverrides</varname>
option. The latter is a function that takes as an argument
the <emphasis>original</emphasis> Nixpkgs, and must evaluate
to a set of new or overriden packages.
to a set of new or overridden packages.
'';
};

2
modules/programs/bash/bashrc.sh
View file

@ -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

2
modules/programs/blcr.nix
View file

@ -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.";
};
};

4
modules/security/polkit.nix
View file

@ -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 <literal>auth_admin</literal>
administrator (i.e. have an <literal>auth_admin</literal>
value). By default, this is the <literal>root</literal>
user and all users in the <literal>wheel</literal> group.
'';

2
modules/security/setuid-wrappers.nix
View file

@ -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).
'';
};

4
modules/services/amqp/activemq/default.nix
View file

@ -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 <literal>javaProperties</literal> 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.
'';

2
modules/services/hardware/acpid.nix
View file

@ -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.";
};
};

2
modules/services/hardware/nvidia-optimus.nix
View file

@ -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
'';
};

8
modules/services/misc/nix-daemon.nix
View file

@ -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
<command>nixos-rebuild --no-build-hook</command>
or consider managing <filename>/etc/nix.machines</filename> manually
by setting <option>manualNixMachines</option>. 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
<option>nix.distributedBuilds</option>). 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

2
modules/services/misc/synergy.nix
View file

@ -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 {

2
modules/services/monitoring/ups.nix
View file

@ -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.
'';
};

4
modules/services/networking/dhcpcd.nix
View file

@ -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.
'';
};

4
modules/services/networking/firewall.nix
View file

@ -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

2
modules/services/networking/networkmanager.nix
View file

@ -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 <literal>networkmanager</literal>
will be created. Add all users that should have permission

2
modules/services/web-servers/apache-httpd/default.nix
View file

@ -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

2
modules/services/x11/desktop-managers/kde4.nix
View file

@ -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";

2
modules/system/boot/loader/generations-dir/generations-dir.nix
View file

@ -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.
";
};
};

4
modules/system/boot/loader/init-script/init-script.nix
View file

@ -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.
'';
};
};

2
modules/system/boot/systemd-unit-options.nix
View file

@ -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 {

2
modules/tasks/filesystems/zfs.nix
View file

@ -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.
'';

2
modules/tasks/network-interfaces.nix
View file

@ -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.
'';

2
modules/tasks/scsi-link-power-management.nix
View file

@ -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".
'';
};

4
modules/tasks/tty-backgrounds.nix
View file

@ -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;