Skip to content

Commit f64e7fc

Browse files
author
Ma Shimiao
committed
tfix: replace setup
setup is a noun, 'set up' is a verb Signed-off-by: Ma Shimiao <[email protected]>
1 parent 559acdf commit f64e7fc

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

config-linux.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Linux container specification uses various kernel features like namespaces,
66
## <a name="configLinuxDefaultFilesystems" />Default Filesystems
77

88
The Linux ABI includes both syscalls and several special file paths.
9-
Applications expecting a Linux environment will very likely expect these file paths to be setup correctly.
9+
Applications expecting a Linux environment will very likely expect these file paths to be set up correctly.
1010

1111
The following filesystems SHOULD be made available in each container's filesystem:
1212

@@ -24,7 +24,7 @@ Changes to the global resource are visible to other processes that are members o
2424
For more information, see the [namespaces(7)][namespaces.7_2] man page.
2525

2626
Namespaces are specified as an array of entries inside the `namespaces` root field.
27-
The following parameters can be specified to setup namespaces:
27+
The following parameters can be specified to set up namespaces:
2828

2929
* **`type`** *(string, REQUIRED)* - namespace type. The following namespace types are supported:
3030
* **`pid`** processes inside the container will only be able to see other processes inside the same container.
@@ -161,7 +161,7 @@ In addition to any devices configured with this setting, the runtime MUST also s
161161
* [`/dev/random`][random.4]
162162
* [`/dev/urandom`][random.4]
163163
* [`/dev/tty`][tty.4]
164-
* [`/dev/console`][console.4] is setup if terminal is enabled in the config by bind mounting the pseudoterminal slave to /dev/console.
164+
* [`/dev/console`][console.4] is set up if terminal is enabled in the config by bind mounting the pseudoterminal slave to /dev/console.
165165
* [`/dev/ptmx`][pts.4].
166166
A [bind-mount or symlink of the container's `/dev/pts/ptmx`][devpts].
167167

@@ -270,7 +270,7 @@ For more information, see [the memory cgroup man page][cgroup-v1-memory].
270270
**`memory`** (object, OPTIONAL) represents the cgroup subsystem `memory` and it's used to set limits on the container's memory usage.
271271
For more information, see [the memory cgroup man page][cgroup-v1-memory].
272272

273-
The following parameters can be specified to setup the controller:
273+
The following parameters can be specified to set up the controller:
274274

275275
* **`limit`** *(uint64, OPTIONAL)* - sets limit of memory usage in bytes
276276

@@ -302,7 +302,7 @@ The following parameters can be specified to setup the controller:
302302
**`cpu`** (object, OPTIONAL) represents the cgroup subsystems `cpu` and `cpusets`.
303303
For more information, see [the cpusets cgroup man page][cgroup-v1-cpusets].
304304

305-
The following parameters can be specified to setup the controller:
305+
The following parameters can be specified to set up the controller:
306306

307307
* **`shares`** *(uint64, OPTIONAL)* - specifies a relative share of CPU time available to the tasks in a cgroup
308308

@@ -337,7 +337,7 @@ The following parameters can be specified to setup the controller:
337337
**`blockIO`** (object, OPTIONAL) represents the cgroup subsystem `blkio` which implements the block IO controller.
338338
For more information, see [the kernel cgroups documentation about blkio][cgroup-v1-blkio].
339339

340-
The following parameters can be specified to setup the controller:
340+
The following parameters can be specified to set up the controller:
341341

342342
* **`blkioWeight`** *(uint16, OPTIONAL)* - specifies per-cgroup weight. This is default weight of the group on all devices until and unless overridden by per-device rules.
343343

@@ -419,7 +419,7 @@ Each entry has the following structure:
419419
**`network`** (object, OPTIONAL) represents the cgroup subsystems `net_cls` and `net_prio`.
420420
For more information, see [the net\_cls cgroup man page][cgroup-v1-net-cls] and [the net\_prio cgroup man page][cgroup-v1-net-prio].
421421

422-
The following parameters can be specified to setup the controller:
422+
The following parameters can be specified to set up the controller:
423423

424424
* **`classID`** *(uint32, OPTIONAL)* - is the network class identifier the cgroup's network packets will be tagged with
425425

@@ -451,7 +451,7 @@ The following parameters can be specified to setup the controller:
451451
**`pids`** (object, OPTIONAL) represents the cgroup subsystem `pids`.
452452
For more information, see [the pids cgroup man page][cgroup-v1-pids].
453453

454-
The following parameters can be specified to setup the controller:
454+
The following parameters can be specified to set up the controller:
455455

456456
* **`limit`** *(int64, REQUIRED)* - specifies the maximum number of tasks in the cgroup
457457

@@ -514,7 +514,7 @@ The actions, architectures, and operators are strings that match the definitions
514514

515515
**`seccomp`** (object, OPTIONAL)
516516

517-
The following parameters can be specified to setup seccomp:
517+
The following parameters can be specified to set up seccomp:
518518

519519
* **`defaultAction`** *(string, REQUIRED)* - the default action for seccomp. Allowed values are the same as `syscalls[].action`.
520520

config-solaris.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ cappedMemory is mapped to `capped-memory` in [zonecfg(1M)][zonecfg.1m_2] man pag
7070
## <a name="configSolarisNetwork" />Network
7171

7272
### <a name="configSolarisAutomaticNetwork" />Automatic Network (anet)
73-
anet is specified as an array that is used to setup networking for Solaris application containers.
73+
anet is specified as an array that is used to set up networking for Solaris application containers.
7474
The anet resource represents the automatic creation of a network resource for an application container.
7575
The zones administration daemon, zoneadmd, is the primary process for managing the container's virtual platform.
7676
One of the daemon's responsibilities is creation and teardown of the networks for the container.
7777
For more information on the daemon see the [zoneadmd(1M)][zoneadmd.1m] man page.
7878
When such a container is started, a temporary VNIC(Virtual NIC) is automatically created for the container.
7979
The VNIC is deleted when the container is torn down.
80-
The following properties can be used to setup automatic networks.
80+
The following properties can be used to set up automatic networks.
8181
For additional information on properties, check the [zonecfg(1M)][zonecfg.1m_2] man page for the respective release of Solaris.
8282

8383
* **`linkname`** *(string, OPTIONAL)* Specify a name for the automatically created VNIC datalink.

0 commit comments

Comments
 (0)