Merge pull request #8787 from jsoref/spelling

Spelling

Makefile

@@ -176,7 +176,7 @@ gofmt: ## Verify the source code gofmt
 test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
 	$(GO) build $(BUILDFLAGS) -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
 
-.PHONY: test/goecho/goechoe
+.PHONY: test/goecho/goecho
 test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
 	$(GO) build $(BUILDFLAGS) -ldflags '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
 

README.md

@@ -38,7 +38,7 @@ Podman presently only supports running containers on Linux. However, we are buil
 
 ## Communications
 
-If you think you've identified a security issue in the project, please *DO NOT* report the issue publicly via the Github issue tracker, mailing list, or IRC.
+If you think you've identified a security issue in the project, please *DO NOT* report the issue publicly via the GitHub issue tracker, mailing list, or IRC.
 Instead, send an email with as many details as possible to `[email protected]`. This is a private mailing list for the core maintainers.
 
 For general questions and discussion, please use the

RELEASE_NOTES.md

@@ -51,7 +51,7 @@
 - Fixed a bug where rootless Podman could hang when the `newuidmap` binary was not installed ([#7776](https://github.com/containers/podman/issues/7776)).
 - Fixed a bug where the `--pull` option to `podman run`, `podman create`,  and `podman build` did not match Docker's behavior.
 - Fixed a bug where sysctl settings from the `containers.conf` configuration file were applied, even if the container did not join the namespace associated with a sysctl.
-- Fixed a bug where Podman would not return the text of errors encounted when trying to run a healthcheck for a container.
+- Fixed a bug where Podman would not return the text of errors encountered when trying to run a healthcheck for a container.
 - Fixed a bug where Podman was accidentally setting the `containers` environment variable in addition to the expected `container` environment variable.
 - Fixed a bug where rootless Podman using CNI networking did not properly clean up DNS entries for removed containers ([#7789](https://github.com/containers/podman/issues/7789)).
 - Fixed a bug where the `podman untag --all` command was not supported with remote Podman.
@@ -181,7 +181,7 @@
 - The `podman run` and `podman create` commands can now specify options to slirp4netns by using the `--network` option as follows:  `--net slirp4netns:opt1,opt2`. This allows for, among other things, switching the port forwarder used by slirp4netns away from rootlessport.
 - The `podman ps` command now features a new option, `--storage`, to show containers from Buildah, CRI-O and other applications.
 - The `podman run` and `podman create` commands now feature a `--sdnotify` option to control the behavior of systemd's sdnotify with containers, enabling improved support for Podman in `Type=notify` units.
-- The `podman run` command now features a `--preserve-fds` opton to pass file descriptors from the host into the container ([#6458](https://github.com/containers/podman/issues/6458)).
+- The `podman run` command now features a `--preserve-fds` option to pass file descriptors from the host into the container ([#6458](https://github.com/containers/podman/issues/6458)).
 - The `podman run` and `podman create` commands can now create overlay volume mounts, by adding the `:O` option to a bind mount (e.g. `-v /test:/test:O`). Overlay volume mounts will mount a directory into a container from the host and allow changes to it, but not write those changes back to the directory on the host.
 - The `podman play kube` command now supports the Socket HostPath type ([#7112](https://github.com/containers/podman/issues/7112)).
 - The `podman play kube` command now supports read-only mounts.
@@ -269,7 +269,7 @@
 - Fixed a bug where endpoints that hijacked would do perform the hijack too early, before being ready to send and receive data ([#7195](https://github.com/containers/podman/issues/7195)).
 - Fixed a bug where Pod endpoints that can operate on multiple containers at once (e.g. Kill, Pause, Unpause, Stop) would not forward errors from individual containers that failed.
 - The Compat List endpoint for networks now supports filtering results ([#7462](https://github.com/containers/podman/issues/7462)).
-- Fixed a bug where the Top endpoint for pods would return both a 500 and 404 when run on a non-existant pod.
+- Fixed a bug where the Top endpoint for pods would return both a 500 and 404 when run on a nonexistent pod.
 - Fixed a bug where Pull endpoints did not stream progress back to the client.
 - The Version endpoints (Libpod and Compat) now provide version in a format compatible with Docker.
 - All non-hijacking responses to API requests should not include headers with the version of the server.
@@ -310,7 +310,7 @@
 - Fixed a bug where the `podman generate systemd` command would panic on an invalid restart policy being specified ([#7271](https://github.com/containers/podman/issues/7271)).
 - Fixed a bug where the `podman images` command could take a very long time (several minutes) to complete when a large number of images were present.
 - Fixed a bug where the `podman logs` command with the `--tail` flag would not work properly when a large amount of output would be printed ([#7230](https://github.com/containers/podman/issues/7230)).
-- Fixed a bug where the `podman exec` command with remote Podman would not return a non-zero exit code when the exec session failed to start (e.g. invoking a non-existent command) ([#6893](https://github.com/containers/podman/issues/6893)).
+- Fixed a bug where the `podman exec` command with remote Podman would not return a non-zero exit code when the exec session failed to start (e.g. invoking a nonexistent command) ([#6893](https://github.com/containers/podman/issues/6893)).
 - Fixed a bug where the `podman load` command with remote Podman would did not honor user-specified tags ([#7124](https://github.com/containers/podman/issues/7124)).
 - Fixed a bug where the `podman system service` command, when run as a non-root user by Systemd, did not properly handle the Podman pause process and would not restart properly as a result ([#7180](https://github.com/containers/podman/issues/7180)).
 - Fixed a bug where the `--publish` flag to `podman create`, `podman run`, and `podman pod create` did not properly handle a host IP of 0.0.0.0 (attempting to bind to literal 0.0.0.0, instead of all IPs on the system) ([#7104](https://github.com/containers/podman/issues/7014)).
@@ -411,7 +411,7 @@
 
 ### Bugfixes
 - Fixed a bug where the `podman ps` command would not truncate long container commands, resulting in display issues as the column could become extremely wide (the `--no-trunc` flag can be used to print the full command).
-- Fixed a bug where `podman pod` commands operationg on multiple containers (e.g. `podman pod stop` and `podman pod kill`) would not print errors from individual containers, but only a warning that some containers had failed.
+- Fixed a bug where `podman pod` commands operating on multiple containers (e.g. `podman pod stop` and `podman pod kill`) would not print errors from individual containers, but only a warning that some containers had failed.
 - Fixed a bug where the `podman system service` command would panic if a connection to the Events endpoint hung up early ([#6805](https://github.com/containers/libpod/issues/6805)).
 - Fixed a bug where rootless Podman would create anonymous and named volumes with the wrong owner for containers run with the `--user` directive.
 - Fixed a bug where the `TMPDIR` environment variable (used for storing temporary files while pulling images) was not being defaulted (if unset) to `/var/tmp`.
@@ -425,7 +425,7 @@
 
 ### API
 - Fixed a bug where the timestamp format for Libpod image list endpoint was incorrect - the format has been switched to Unix time.
-- Fixed a bug where the compatability Create endpoint did not handle empty entrypoints properly.
+- Fixed a bug where the compatibility Create endpoint did not handle empty entrypoints properly.
 - Fixed a bug where the compatibility network remove endpoint would improperly handle errors where the network was not found.
 - Fixed a bug where containers would be created with improper permissions because of a umask issue ([#6787](https://github.com/containers/libpod/issues/6787)).
 
@@ -455,7 +455,7 @@
 - Fixed a bug where the `label` option to `--security-opt` would only be shown once in `podman inspect`, even if provided multiple times.
 
 ### API
-- Fixed a bug where network endpoint URLs in the compatability API were mistakenly suffixed with `/json`.
+- Fixed a bug where network endpoint URLs in the compatibility API were mistakenly suffixed with `/json`.
 - Fixed a bug where the Libpod volume creation endpoint returned 200 instead of 201 on success.
 
 ### Misc
@@ -485,7 +485,7 @@
 - Named and anonymous volumes and `tmpfs` filesystems added to containers are no longer mounted `noexec` by default.
 
 ### Bugfixes
-- Fixed a bug where the `podman exec` command would log to journald when run in containers loggined to journald ([#6555](https://github.com/containers/podman/issues/6555)).
+- Fixed a bug where the `podman exec` command would log to journald when run in containers logged to journald ([#6555](https://github.com/containers/podman/issues/6555)).
 - Fixed a bug where the `podman auto-update` command would not preserve the OS and architecture of the original image when pulling a replacement ([#6613](https://github.com/containers/podman/issues/6613)).
 - Fixed a bug where the `podman cp` command could create an extra `merged` directory when copying into an existing directory ([#6596](https://github.com/containers/podman/issues/6596)).
 - Fixed a bug where the `podman pod stats` command would crash on pods run with `--network=host` ([#5652](https://github.com/containers/podman/issues/5652)).
@@ -521,7 +521,7 @@
 
 ### Misc
 - Rootless containers will now automatically set their ulimits to the maximum allowed for the user running the container, to match the behavior of containers run as root
-- Packages managed by the core Podman team will no longer include a default `libpod.conf`, instead defaulting to `containers.conf`. The default libpod.conf will remain available in the Github repository until the release of Podman 2.0
+- Packages managed by the core Podman team will no longer include a default `libpod.conf`, instead defaulting to `containers.conf`. The default libpod.conf will remain available in the GitHub repository until the release of Podman 2.0
 - The default Podman CNI network configuration now sets HairpinMode to allow containers to access other containers via ports published on the host
 - Updated containers/common to v0.8.4
 
@@ -1105,7 +1105,7 @@
 
 ### Bugfixes
 - Fixed a bug where `podman cp` would not copy folders ([#2836](https://github.com/containers/podman/issues/2836))
-- Fixed a bug where Podman would panic when the Varlink API attempted too pull a non-existent image ([#2860](https://github.com/containers/podman/issues/2860))
+- Fixed a bug where Podman would panic when the Varlink API attempted too pull a nonexistent image ([#2860](https://github.com/containers/podman/issues/2860))
 - Fixed a bug where `podman rmi` sometimes did not produce an event when images were deleted
 - Fixed a bug where Podman would panic when the Varlink API passed improperly-formatted options when attempting to build ([#2869](https://github.com/containers/podman/issues/2869))
 - Fixed a bug where `podman images` would not print a header if no images were present ([#2877](https://github.com/containers/podman/pull/2877))

cmd/podman/common/create.go

@@ -642,7 +642,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 
 	storageOptFlagName := "storage-opt"
 	createFlags.StringSliceVar(
-		&cf.StoreageOpt,
+		&cf.StorageOpt,
 		storageOptFlagName, []string{},
 		"Storage driver options per container",
 	)
@@ -671,7 +671,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 		sysctlFlagName, []string{},
 		"Sysctl options",
 	)
-	//TODO: Add function for systctl completion.
+	//TODO: Add function for sysctl completion.
 	_ = cmd.RegisterFlagCompletionFunc(sysctlFlagName, completion.AutocompleteNone)
 
 	systemdFlagName := "systemd"
@@ -696,13 +696,13 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 		"Allocate a pseudo-TTY for container",
 	)
 
-	timezonezFlagName := "tz"
+	timezoneFlagName := "tz"
 	createFlags.StringVar(
 		&cf.Timezone,
-		timezonezFlagName, containerConfig.TZ(),
+		timezoneFlagName, containerConfig.TZ(),
 		"Set timezone in container",
 	)
-	_ = cmd.RegisterFlagCompletionFunc(timezonezFlagName, completion.AutocompleteNone) //TODO: add timezone completion
+	_ = cmd.RegisterFlagCompletionFunc(timezoneFlagName, completion.AutocompleteNone) //TODO: add timezone completion
 
 	umaskFlagName := "umask"
 	createFlags.StringVar(

cmd/podman/common/create_opts.go

@@ -98,7 +98,7 @@ type ContainerCLIOpts struct {
 	SignaturePolicy   string
 	StopSignal        string
 	StopTimeout       uint
-	StoreageOpt       []string
+	StorageOpt        []string
 	SubUIDName        string
 	SubGIDName        string
 	Sysctl            []string
@@ -310,7 +310,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 	// on speculation by Matt and I. We think that these come into play later
 	// like with start. We believe this is just a difference in podman/compat
 	cliOpts := ContainerCLIOpts{
-		// Attach:            nil, // dont need?
+		// Attach:            nil, // don't need?
 		Authfile:     "",
 		CapAdd:       append(capAdd, cc.HostConfig.CapAdd...),
 		CapDrop:      append(cappDrop, cc.HostConfig.CapDrop...),
@@ -321,11 +321,11 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 		CPURTPeriod:  uint64(cc.HostConfig.CPURealtimePeriod),
 		CPURTRuntime: cc.HostConfig.CPURealtimeRuntime,
 		CPUShares:    uint64(cc.HostConfig.CPUShares),
-		// CPUS:              0, // dont need?
+		// CPUS:              0, // don't need?
 		CPUSetCPUs: cc.HostConfig.CpusetCpus,
 		CPUSetMems: cc.HostConfig.CpusetMems,
-		// Detach:            false, // dont need
-		// DetachKeys:        "",    // dont need
+		// Detach:            false, // don't need
+		// DetachKeys:        "",    // don't need
 		Devices:          devices,
 		DeviceCGroupRule: nil,
 		DeviceReadBPs:    readBps,
@@ -359,7 +359,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 		Rm:               cc.HostConfig.AutoRemove,
 		SecurityOpt:      cc.HostConfig.SecurityOpt,
 		StopSignal:       cc.Config.StopSignal,
-		StoreageOpt:      stringMaptoArray(cc.HostConfig.StorageOpt),
+		StorageOpt:       stringMaptoArray(cc.HostConfig.StorageOpt),
 		Sysctl:           stringMaptoArray(cc.HostConfig.Sysctls),
 		Systemd:          "true", // podman default
 		TmpFS:            stringMaptoArray(cc.HostConfig.Tmpfs),

cmd/podman/common/specgen.go

@@ -488,9 +488,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
 	s.ConmonPidFile = c.ConmonPIDFile
 
 	// TODO
-	// ouitside of specgen and oci though
+	// outside of specgen and oci though
 	// defaults to true, check spec/storage
-	// s.readon = c.ReadOnlyTmpFS
+	// s.readonly = c.ReadOnlyTmpFS
 	//  TODO convert to map?
 	// check if key=value and convert
 	sysmap := make(map[string]string)

cmd/podman/completion/completion.go

@@ -32,7 +32,7 @@ var (
 		Example: `podman completion bash
   podman completion zsh -f _podman
   podman completion fish --no-desc`,
-		//dont show this command to users
+		//don't show this command to users
 		Hidden: true,
 	}
 )

cmd/podman/containers/cp.go

@@ -55,7 +55,7 @@ var (
 func cpFlags(cmd *cobra.Command) {
 	flags := cmd.Flags()
 	flags.BoolVar(&cpOpts.Extract, "extract", false, "Deprecated...")
-	flags.BoolVar(&cpOpts.Pause, "pause", true, "Deorecated")
+	flags.BoolVar(&cpOpts.Pause, "pause", true, "Deprecated")
 	_ = flags.MarkHidden("extract")
 	_ = flags.MarkHidden("pause")
 }

cmd/podman/containers/create.go

@@ -171,7 +171,7 @@ func createInit(c *cobra.Command) error {
 	}
 	cliVals.UserNS = c.Flag("userns").Value.String()
 	// if user did not modify --userns flag and did turn on
-	// uid/gid mappsings, set userns flag to "private"
+	// uid/gid mappings, set userns flag to "private"
 	if !c.Flag("userns").Changed && cliVals.UserNS == "host" {
 		if len(cliVals.UIDMap) > 0 ||
 			len(cliVals.GIDMap) > 0 ||
@@ -239,7 +239,7 @@ func pullImage(imageName string) (string, error) {
 
 	if cliVals.Platform != "" {
 		if cliVals.OverrideArch != "" || cliVals.OverrideOS != "" {
-			return "", errors.Errorf("--platform option can not be specified with --overide-arch or --override-os")
+			return "", errors.Errorf("--platform option can not be specified with --override-arch or --override-os")
 		}
 		split := strings.SplitN(cliVals.Platform, "/", 2)
 		cliVals.OverrideOS = split[0]

cmd/podman/containers/mount.go

@@ -39,7 +39,7 @@ var (
 		ValidArgsFunction: common.AutocompleteContainers,
 	}
 
-	containerMountCommmand = &cobra.Command{
+	containerMountCommand = &cobra.Command{
 		Use:               mountCommand.Use,
 		Short:             mountCommand.Short,
 		Long:              mountCommand.Long,
@@ -76,11 +76,11 @@ func init() {
 
 	registry.Commands = append(registry.Commands, registry.CliCommand{
 		Mode:    []entities.EngineMode{entities.ABIMode},
-		Command: containerMountCommmand,
+		Command: containerMountCommand,
 		Parent:  containerCmd,
 	})
-	mountFlags(containerMountCommmand)
-	validate.AddLatestFlag(containerMountCommmand, &mountOpts.Latest)
+	mountFlags(containerMountCommand)
+	validate.AddLatestFlag(containerMountCommand, &mountOpts.Latest)
 }
 
 func mount(_ *cobra.Command, args []string) error {

cmd/podman/images/pull.go

@@ -139,7 +139,7 @@ func imagePull(cmd *cobra.Command, args []string) error {
 	}
 	if platform != "" {
 		if pullOptions.OverrideArch != "" || pullOptions.OverrideOS != "" {
-			return errors.Errorf("--platform option can not be specified with --overide-arch or --override-os")
+			return errors.Errorf("--platform option can not be specified with --override-arch or --override-os")
 		}
 		split := strings.SplitN(platform, "/", 2)
 		pullOptions.OverrideOS = split[0]

cmd/podman/inspect/inspect.go

@@ -51,7 +51,7 @@ func AddInspectFlagSet(cmd *cobra.Command) *entities.InspectOptions {
 	_ = cmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
 
 	typeFlagName := "type"
-	flags.StringVarP(&opts.Type, typeFlagName, "t", AllType, fmt.Sprintf("Specify inspect-oject type (%q, %q or %q)", ImageType, ContainerType, AllType))
+	flags.StringVarP(&opts.Type, typeFlagName, "t", AllType, fmt.Sprintf("Specify inspect-object type (%q, %q or %q)", ImageType, ContainerType, AllType))
 	_ = cmd.RegisterFlagCompletionFunc(typeFlagName, common.AutocompleteInspectType)
 
 	validate.AddLatestFlag(cmd, &opts.Latest)

commands-demo.md

@@ -48,7 +48,7 @@
 | [podman-network(1)](https://podman.readthedocs.io/en/latest/network.html)                                             | Manage Podman CNI networks                                                 |
 | [podman-network-create(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-create.1.html)             | Create a CNI network                                                       |
 | [podman-network-connect(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-connect.1.html)           | Connect a container to a CNI network                                       |
-| [podman-network-disconnect(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-dosconnect.1.html)             | Disconnect a container from a CNI network                                  |
+| [podman-network-disconnect(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-disconnect.1.html)             | Disconnect a container from a CNI network                                  |
 | [podman-network-inspect(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-inspect.1.html)           | Displays the raw CNI network configuration for one or more networks        |
 | [podman-network-ls(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-ls.1.html)                     | Display a summary of CNI networks                                          |
 | [podman-network-rm(1)](https://podman.readthedocs.io/en/latest/markdown/podman-network-rm.1.html)                     | Remove one or more CNI networks                                            |