Merge pull request #18105 from rhatdan/codespell

Fix up codespell errors
containers · Apr 10, 2023 · 0a89a22 · 0a89a22
2 parents c04ccdb + c4e79fc
commit 0a89a22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/source/markdown/podman-network.1.md b/docs/source/markdown/podman-network.1.md
@@ -42,7 +42,7 @@ Podman requires specific default IPs and, thus, network subnets.  The default va
 The default bridge network (called `podman`) uses 10.88.0.0/16 as a subnet. When Podman runs as root, the `podman` network is used as default.  It is the same as adding the option `--network bridge` or `--network podman`. This subnet can be changed in **[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)** under the [network] section. Set the `default_subnet` to any subnet that is free in the environment. The name of the default network can also be changed from `podman` to another name using the default network key. Note that this should only be done when no containers are running.
 
 ### Slirp4netns
-When Podman is run as rootless, the internet connectivity is provided with slirp4netns by default. Slirp4nents uses 10.0.2.0/24 for its default network. This can also be changed in **[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)** but under the `[engine]` section. Use the `network_cmd_options` key and add `["cidr=X.X.X.X/24"]` as a value. Note that slirp4netns needs a network prefix size between 1 and 25. This option accepts an array, so more options can be added in a comma-separated string as described on the **[podman-network-create(1)](podman-network-create.1.md)** man page. To change the CIDR for just one container, specify it on the cli using the `--network` opiton like this: `--network slirp4netns:cidr=192.168.1.0/24`.
+When Podman is run as rootless, the internet connectivity is provided with slirp4netns by default. Slirp4nents uses 10.0.2.0/24 for its default network. This can also be changed in **[containers.conf(5)](https://github.com/containers/common/blob/main/docs/containers.conf.5.md)** but under the `[engine]` section. Use the `network_cmd_options` key and add `["cidr=X.X.X.X/24"]` as a value. Note that slirp4netns needs a network prefix size between 1 and 25. This option accepts an array, so more options can be added in a comma-separated string as described on the **[podman-network-create(1)](podman-network-create.1.md)** man page. To change the CIDR for just one container, specify it on the cli using the `--network` option like this: `--network slirp4netns:cidr=192.168.1.0/24`.
 
 When using the default network as rootless, i.e. --network podman/bridge, then it also uses the same subnet as described above in addition to the slirp4netns subnet.
 

diff --git a/libpod/kube.go b/libpod/kube.go
@@ -172,7 +172,7 @@ func GenerateForKubeDeployment(ctx context.Context, pod *YAMLPod, options entiti
 		depSpec.Replicas = &options.Replicas
 	}
 
-	// Create the Deployment opbject
+	// Create the Deployment object
 	dep := YAMLDeployment{
 		Deployment: v1.Deployment{
 			ObjectMeta: v12.ObjectMeta{

diff --git a/test/system/005-info.bats b/test/system/005-info.bats
@@ -203,7 +203,7 @@ EOF
     CONTAINERS_CONF_OVERRIDE=$overrideConf run_podman info --format "{{ .Host.DatabaseBackend }}"
     is "$output" "sqlite"
 
-    # CONTAINERS_CONF will be overriden by _OVERRIDE
+    # CONTAINERS_CONF will be overridden by _OVERRIDE
     CONTAINERS_CONF=$containersConf CONTAINERS_CONF_OVERRIDE=$overrideConf run_podman info --format "{{ .Host.DatabaseBackend }}"
     is "$output" "sqlite"
 }