Skip to content

Commit 87cc770

Browse files
committed
docs: Fix typos and formatting
Tidy up docs by resolving spelling mistakes and fixing bad formatting. Fixes: kata-containers#487. Signed-off-by: James O. D. Hunt <[email protected]>
1 parent b85935b commit 87cc770

24 files changed

+333
-326
lines changed

Developer-Guide.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* [Run Kata Containers with Kubernetes](#run-kata-containers-with-kubernetes)
3434
* [Install a CRI implementation](#install-a-cri-implementation)
3535
* [CRI-O](#cri-o)
36-
* [containerd with cri plugin](#containerd-with-cri-plugin)
36+
* [containerd with CRI plugin](#containerd-with-cri-plugin)
3737
* [Install Kubernetes](#install-kubernetes)
3838
* [Configure for CRI-O](#configure-for-cri-o)
3939
* [Configure for containerd](#configure-for-containerd)
@@ -133,7 +133,7 @@ $ sudo sed -i 's/^\(initrd =.*\)/# \1/g' /etc/kata-containers/configuration.toml
133133
```
134134
The rootfs image is created as shown in the [create a rootfs image](#create-a-rootfs-image) section.
135135

136-
One of the `initrd` and `image` options in kata runtime config file **MUST** be set but **not both**.
136+
One of the `initrd` and `image` options in Kata runtime config file **MUST** be set but **not both**.
137137
The main difference between the options is that the size of `initrd`(10MB+) is significantly smaller than
138138
rootfs `image`(100MB+).
139139

@@ -297,7 +297,7 @@ $ sudo rm -rf ${ROOTFS_DIR}
297297
$ cd $GOPATH/src/github.com/kata-containers/osbuilder/rootfs-builder
298298
$ script -fec 'sudo -E GOPATH=$GOPATH AGENT_INIT=yes USE_DOCKER=true SECCOMP=no ./rootfs.sh ${distro}'
299299
```
300-
`AGENT_INIT` controls if the guest image uses kata agent as the guest `init` process. When you create an initrd image,
300+
`AGENT_INIT` controls if the guest image uses the Kata agent as the guest `init` process. When you create an initrd image,
301301
always set `AGENT_INIT` to `yes`. By default `seccomp` packages are not included in the initrd image. Set `SECCOMP` to `yes` to include them.
302302

303303
You MUST choose one of `alpine`, `centos`, `clearlinux`, `euleros`, and `fedora` for `${distro}`.
@@ -348,8 +348,8 @@ $ curl -LOk ${kernel_url}
348348
$ tar -xf ${kernel_tar_file}
349349
$ mv .config "linux-${kernel_version}"
350350
$ pushd "linux-${kernel_version}"
351-
$ curl -L https://raw.githubusercontent.com/kata-containers/packaging/master/kernel/patches/4.19.x/0001-NO-UPSTREAM-9P-always-use-cached-inode-to-fill-in-v9.patch | patch -p1
352-
$ curl -L https://raw.githubusercontent.com/kata-containers/packaging/master/kernel/patches/4.19.x/0002-Compile-in-evged-always.patch | patch -p1
351+
$ curl -L https://raw.githubusercontent.com/kata-containers/packaging/master/kernel/patches/4.19.x/0003-NO-UPSTREAM-9P-always-use-cached-inode-to-fill-in-v9.patch | patch -p1
352+
$ curl -L https://raw.githubusercontent.com/kata-containers/packaging/master/kernel/patches/4.19.x/0004-Compile-in-evged-always.patch | patch -p1
353353
$ make ARCH=${kernel_dir} -j$(nproc)
354354
$ kata_kernel_dir="/usr/share/kata-containers"
355355
$ kata_vmlinuz="${kata_kernel_dir}/kata-vmlinuz-${kernel_version}.container"
@@ -371,7 +371,7 @@ When setting up Kata using a [packaged installation method](https://github.com/k
371371

372372
## Build a custom QEMU
373373

374-
Your qemu directory need to be prepared with source code. Alternatively, you can use the [Kata containers QEMU](https://github.com/kata-containers/qemu/tree/master) and checkout the recommended branch:
374+
Your QEMU directory need to be prepared with source code. Alternatively, you can use the [Kata containers QEMU](https://github.com/kata-containers/qemu/tree/master) and checkout the recommended branch:
375375

376376
```
377377
$ go get -d github.com/kata-containers/qemu
@@ -397,7 +397,7 @@ $ sudo -E make install
397397
>
398398
> - You should only do this step if you are on aarch64/arm64.
399399
> - You should include [Eric Auger's latest PCDIMM/NVDIMM patches](https://patchwork.kernel.org/cover/10647305/) which are
400-
> under upstream review for supporting nvdimm on aarch64.
400+
> under upstream review for supporting NVDIMM on aarch64.
401401
>
402402
You could build the custom `qemu-system-aarch64` as required with the following command:
403403
```
@@ -508,7 +508,7 @@ Restart CRI-O to take changes into account
508508
$ sudo systemctl restart crio
509509
```
510510

511-
### containerd with cri plugin
511+
### containerd with CRI plugin
512512

513513
If you select containerd with `cri` plugin, follow the "Getting Started for Developers"
514514
instructions [here](https://github.com/containerd/cri#getting-started-for-developers)
@@ -522,12 +522,11 @@ To customize containerd to select Kata Containers runtime, follow our
522522

523523
Depending on what your needs are and what you expect to do with Kubernetes,
524524
please refer to the following
525-
[documentation](https://kubernetes.io/docs/setup/pick-right-solution/) to
526-
install it correctly.
525+
[documentation](https://kubernetes.io/docs/setup/) to install it correctly.
527526

528527
Kubernetes talks with CRI implementations through a `container-runtime-endpoint`,
529528
also called CRI socket. This socket path is different depending on which CRI
530-
implementation you chose, and the kubelet service has to be updated accordingly.
529+
implementation you chose, and the Kubelet service has to be updated accordingly.
531530

532531
### Configure for CRI-O
533532

@@ -549,8 +548,8 @@ documentation [here](https://github.com/kata-containers/documentation/blob/maste
549548

550549
## Run a Kubernetes pod with Kata Containers
551550

552-
After you update your kubelet service based on the CRI implementation you
553-
are using, reload and restart kubelet. Then, start your cluster:
551+
After you update your Kubelet service based on the CRI implementation you
552+
are using, reload and restart Kubelet. Then, start your cluster:
554553
```bash
555554
$ sudo systemctl daemon-reload
556555
$ sudo systemctl restart kubelet
@@ -564,11 +563,11 @@ $ sudo kubeadm init --skip-preflight-checks --cri-socket /run/containerd/contain
564563
$ export KUBECONFIG=/etc/kubernetes/admin.conf
565564
```
566565

567-
You can force kubelet to use Kata Containers by adding some _untrusted_
566+
You can force Kubelet to use Kata Containers by adding some `untrusted`
568567
annotation to your pod configuration. In our case, this ensures Kata
569568
Containers is the selected runtime to run the described workload.
570569

571-
_nginx-untrusted.yaml_
570+
`nginx-untrusted.yaml`
572571
```yaml
573572
apiVersion: v1
574573
kind: Pod
@@ -594,7 +593,7 @@ If you are unable to create a Kata Container first ensure you have
594593
before attempting to create a container. Then run the
595594
[`kata-collect-data.sh`](https://github.com/kata-containers/runtime/blob/master/data/kata-collect-data.sh.in)
596595
script and paste its output directly into a
597-
[github issue](https://github.com/kata-containers/kata-containers/issues/new).
596+
[GitHub issue](https://github.com/kata-containers/kata-containers/issues/new).
598597

599598
> **Note:**
600599
>

Documentation-Requirements.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ the concept is referred to using a link).
5353
Important information that is not part of the main document flow should be
5454
added as a Note in bold with all content contained within a block quote:
5555

56-
> **Note:** This is areally important point!
56+
> **Note:** This is a really important point!
5757
>
5858
> This particular note also spans multiple lines. The entire note should be
5959
> included inside the quoted block.
@@ -118,15 +118,15 @@ utility.
118118
in a *bash code block* with every command line prefixed with `$ ` to denote
119119
a shell prompt:
120120

121-
```
121+
<pre>
122122

123123
```bash
124124
$ echo "Hi - I am some bash code"
125125
$ sudo docker run -ti busybox true
126126
$ [ $? -eq 0 ] && echo "success"
127127
```
128128

129-
```
129+
<pre>
130130

131131
- If a command needs to be run as the `root` user, it must be run using
132132
`sudo(8)`.
@@ -142,15 +142,15 @@ utility.
142142
- In the unusual case that you need to display command *output*, use an
143143
unadorned code block (\`\`\`):
144144

145-
```
145+
<pre>
146146

147147
The output of the `ls(1)` command is expected to be:
148148

149149
```
150150
ls: cannot access '/foo': No such file or directory
151151
```
152152

153-
```
153+
<pre>
154154

155155
- Long lines should not span across multiple lines by using the '`\`'
156156
continuation character.

Limitations.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* [docker run and shared memory](#docker-run-and-shared-memory)
1414
* [docker run and sysctl](#docker-run-and-sysctl)
1515
* [Docker daemon features](#docker-daemon-features)
16-
* [selinux support](#selinux-support)
16+
* [SELinux support](#selinux-support)
1717
* [Architectural limitations](#architectural-limitations)
1818
* [Networking limitations](#networking-limitations)
1919
* [Support for joining an existing VM network](#support-for-joining-an-existing-vm-network)
@@ -64,10 +64,10 @@ spec and the non-standard extensions provided by `runc`.
6464

6565
# Scope
6666

67-
Each known limitation is captured in a separate github issue that contains
67+
Each known limitation is captured in a separate GitHub issue that contains
6868
detailed information about the issue. These issues are tagged with the
6969
`limitation` label. This document is a curated summary of important known
70-
limitations and provides links to the relevant github issues.
70+
limitations and provides links to the relevant GitHub issues.
7171

7272
The following link shows the latest list of limitations:
7373

@@ -76,7 +76,7 @@ The following link shows the latest list of limitations:
7676
# Contributing
7777

7878
If you would like to work on resolving a limitation, please refer to the
79-
[contributers guide](https://github.com/kata-containers/community/blob/master/CONTRIBUTING.md).
79+
[contributors guide](https://github.com/kata-containers/community/blob/master/CONTRIBUTING.md).
8080
If you wish to raise an issue for a new limitation, either
8181
[raise an issue directly on the runtime](https://github.com/kata-containers/runtime/issues/new)
8282
or see the
@@ -136,7 +136,7 @@ these commands is potentially challenging.
136136
See issue https://github.com/clearcontainers/runtime/issues/341 and [the constraints challenge](#the-constraints-challenge) for more information.
137137

138138
For CPUs resource management see
139-
[cpu-constraints](design/cpu-constraints.md).
139+
[CPU constraints](design/cpu-constraints.md).
140140

141141
### docker run and shared memory
142142

@@ -156,10 +156,10 @@ See issue https://github.com/kata-containers/runtime/issues/185 for more informa
156156
## Docker daemon features
157157

158158
Some features enabled or implemented via the
159-
[dockerd daemon](https://docs.docker.com/config/daemon/) configuration are not yet
159+
[`dockerd` daemon](https://docs.docker.com/config/daemon/) configuration are not yet
160160
implemented.
161161

162-
### selinux support
162+
### SELinux support
163163

164164
The `dockerd` configuration option `"selinux-enabled": true` is not presently implemented
165165
in Kata Containers. Enabling this option causes an OCI runtime error.
@@ -168,7 +168,7 @@ See issue https://github.com/kata-containers/runtime/issues/784 for more informa
168168

169169
The consequence of this is that the [Docker --security-opt is only partially supported](#docker---security-opt-option-partially-supported).
170170

171-
Kubernetes [selinux labels](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#assign-selinux-labels-to-a-container) will also not be applied.
171+
Kubernetes [SELinux labels](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#assign-selinux-labels-to-a-container) will also not be applied.
172172

173173
# Architectural limitations
174174

@@ -244,7 +244,7 @@ Note: The `--security-opt apparmor=your_profile` is not yet supported. See https
244244

245245
## The constraints challenge
246246

247-
Applying resource constraints such as cgroup, cpu, memory, and storage to a workload is not always straightforward with a VM based system. A Kata Container runs in an isolated environment inside a virtual machine. This, coupled with the architecture of Kata Containers, offers many more possibilities than are available to traditional Linux containers due to the various layers and contexts.
247+
Applying resource constraints such as cgroup, CPU, memory, and storage to a workload is not always straightforward with a VM based system. A Kata Container runs in an isolated environment inside a virtual machine. This, coupled with the architecture of Kata Containers, offers many more possibilities than are available to traditional Linux containers due to the various layers and contexts.
248248

249249
In some cases it might be necessary to apply the constraints to multiple levels. In other cases, the hardware isolated VM provides equivalent functionality to the the requested constraint.
250250

Release-Checklist.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This document lists the tasks required to create a Kata Release.
44

5-
It should be pasted directly into a github issue and each item checked off as it is completed.
5+
It should be pasted directly into a GitHub issue and each item checked off as it is completed.
66

77
- [ ] Raise PRs to update the `VERSION` file in the following repositories:
88
- [ ] [agent][agent]
@@ -32,17 +32,17 @@ It should be pasted directly into a github issue and each item checked off as it
3232
- [ ] [image][image]
3333
- [ ] [initrd][initrd]
3434
- [ ] [proxy][proxy]
35-
- [ ] [qemu-lite][qemu-lite]
35+
- [ ] [`qemu-lite`][qemu-lite]
3636
- [ ] [runtime][runtime]
3737
- [ ] [shim][shim]
3838
- [ ] [throttler][throttler]
3939

4040
- [ ] Generate snap packages based on `HEAD`
4141
- [ ] Push snap packages via snapcraft tool
42-
- [ ] Pubish snap packages in the snapcraft store
42+
- [ ] Publish snap packages in the snapcraft store
4343

4444
- [ ] Installation tests (must be done for major releases):
45-
- [ ] Centos
45+
- [ ] CentOS
4646
- [ ] Fedora
4747
- [ ] Ubuntu
4848

Stable-Branch-Strategy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ providing only bug and security fixes.
1717
Kata Containers will maintain two stable release branches in addition to the master branch.
1818
Once a new MAJOR or MINOR release is created from master, a new stable branch is created for
1919
the prior MAJOR or MINOR release and the older stable branch is no longer maintained. End of
20-
maintainence for a branch is announced on the Kata Containers mailing list. Users can determine
20+
maintenance for a branch is announced on the Kata Containers mailing list. Users can determine
2121
the version currently installed by running `kata-runtime kata-env`. It is recommended to use the
2222
latest stable branch available.
2323

@@ -81,7 +81,7 @@ stable and master. While this is not in place currently, it should be considered
8181
### Patch releases
8282

8383
Releases are normally made every other week for patch releases, which include a GitHub release as
84-
well as binary packages. These patch releases are made for both stable branches, and a 'release candidate'
84+
well as binary packages. These patch releases are made for both stable branches, and a "release candidate"
8585
for the next `MAJOR` or `MINOR` is created from master. If there are no changes across all the repositories, no
8686
release is created and an announcement is made on the developer mailing list to highlight this.
8787
If a release is being made, each repository is tagged for this release, regardless
@@ -103,8 +103,8 @@ Kata guarantees compatibility between components that are within one minor relea
103103

104104
This is critical for dependencies which cross between host (runtime, shim, proxy) and
105105
the guest (hypervisor, rootfs and agent). For example, consider a cluster with a long-running
106-
deployment, workload-never-dies, all on kata version 1.1.3 components. If the operator updates
106+
deployment, workload-never-dies, all on Kata version 1.1.3 components. If the operator updates
107107
the Kata components to the next new minor release (i.e. 1.2.0), we need to guarantee that the 1.2.0
108108
runtime still communicates with 1.1.3 agent within workload-never-dies.
109109

110-
Handling live-update is out of the scope of this document. See this [kata-runtime issue](https://github.com/kata-containers/runtime/issues/492) for details.
110+
Handling live-update is out of the scope of this document. See this [`kata-runtime` issue](https://github.com/kata-containers/runtime/issues/492) for details.

Upgrading.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ new package versions are published.
157157

158158
The `kata-linux-container` package contains a Linux\* kernel based on the
159159
latest vanilla version of the
160-
[longterm kernel](https://www.kernel.org/)
160+
[long-term kernel](https://www.kernel.org/)
161161
plus a small number of
162162
[patches](https://github.com/kata-containers/packaging/tree/master/kernel).
163163

164164
The `Longterm` branch is only updated with
165165
[important bug fixes](https://www.kernel.org/category/releases.html)
166166
meaning this package is only updated when necessary.
167167

168-
The guest kernel package is updated when a new longterm kernel is released
168+
The guest kernel package is updated when a new long-term kernel is released
169169
and when any patch updates are required.
170170

171171
### Image

0 commit comments

Comments
 (0)