Skip to content

Commit aa4279a

Browse files
committed
Fix spelling "setup" -> "set up" and similar
* Replace "setup", "lookup", "cleanup", "backup" with "set up", "look up", "clean up", "back up" when used as verbs. Replace also variations of those. * Improve language in a few places. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
1 parent ca26d44 commit aa4279a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+98
-98
lines changed

RELEASE_PROCESS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ spelled with complete minutiae.
162162
release branch (`git checkout upstream/vX.Y`).
163163
1. Create a new local working-branch to develop the release PR,
164164
`git checkout -b bump_vX.Y.Z`.
165-
1. Lookup the *COMMIT ID* of the last release,
165+
1. Look up the *COMMIT ID* of the last release,
166166
`git log -1 $(git tag | sort -V | tail -1)`.
167167
1. Edit `version/version.go` and bump the `Version` value to the new
168168
release version. If there were API changes, also bump `APIVersion` value.

cmd/podman-mac-helper/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func getUserInfo(name string) (string, string, string, error) {
7373
entry := readCapped(output)
7474
elements := strings.Split(entry, ":")
7575
if len(elements) < 9 || elements[0] != name {
76-
return "", "", "", errors.New("Could not lookup user")
76+
return "", "", "", errors.New("Could not look up user")
7777
}
7878

7979
return elements[0], elements[2], elements[8], nil
@@ -90,7 +90,7 @@ func getUser() (string, string, string, error) {
9090

9191
_, uid, home, err := getUserInfo(name)
9292
if err != nil {
93-
return "", "", "", fmt.Errorf("could not lookup user: %s", name)
93+
return "", "", "", fmt.Errorf("could not look up user: %s", name)
9494
}
9595
id, err := strconv.Atoi(uid)
9696
if err != nil {

cmd/podman/containers/cleanup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var (
2323
cleanupCommand = &cobra.Command{
2424
Annotations: map[string]string{registry.EngineMode: registry.ABIMode},
2525
Use: "cleanup [options] CONTAINER [CONTAINER...]",
26-
Short: "Cleanup network and mountpoints of one or more containers",
26+
Short: "Clean up network and mountpoints of one or more containers",
2727
Long: cleanupDescription,
2828
RunE: cleanup,
2929
Args: func(cmd *cobra.Command, args []string) error {

cmd/podman/containers/port.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
var (
18-
portDescription = `List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT
18+
portDescription = `List port mappings for the CONTAINER, or look up the public-facing port that is NAT-ed to the PRIVATE_PORT
1919
`
2020
portCommand = &cobra.Command{
2121
Use: "port [options] CONTAINER [PORT]",

cmd/podman/registry/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func setXdgDirs() error {
9292
return nil
9393
}
9494

95-
// Setup XDG_RUNTIME_DIR
95+
// Set up XDG_RUNTIME_DIR
9696
if _, found := os.LookupEnv("XDG_RUNTIME_DIR"); !found {
9797
dir, err := util.GetRuntimeDir()
9898
if err != nil {
@@ -110,7 +110,7 @@ func setXdgDirs() error {
110110
}
111111
}
112112

113-
// Setup XDG_CONFIG_HOME
113+
// Set up XDG_CONFIG_HOME
114114
if _, found := os.LookupEnv("XDG_CONFIG_HOME"); !found {
115115
cfgHomeDir, err := util.GetRootlessConfigHomeDir()
116116
if err != nil {

cmd/podman/system/connection/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func GetUserInfo(uri *url.URL) (*url.Userinfo, error) {
188188
if u, found := os.LookupEnv("_CONTAINERS_ROOTLESS_UID"); found {
189189
usr, err = user.LookupId(u)
190190
if err != nil {
191-
return nil, errors.Wrapf(err, "failed to lookup rootless user")
191+
return nil, errors.Wrapf(err, "failed to look up rootless user")
192192
}
193193
} else {
194194
usr, err = user.Current()

cmd/podman/validate/args.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ func CheckAllLatestAndIDFile(c *cobra.Command, args []string, ignoreArgLen bool,
7373
specifiedLatest, _ = c.Flags().GetBool("latest")
7474
if c.Flags().Lookup("all") == nil || c.Flags().Lookup("latest") == nil {
7575
if idFileFlag == "" {
76-
return errors.New("unable to lookup values for 'latest' or 'all'")
76+
return errors.New("unable to look up values for 'latest' or 'all'")
7777
} else if c.Flags().Lookup(idFileFlag) == nil {
78-
return errors.Errorf("unable to lookup values for 'latest', 'all', or '%s'", idFileFlag)
78+
return errors.Errorf("unable to look up values for 'latest', 'all', or '%s'", idFileFlag)
7979
}
8080
}
8181
}

cmd/winpath/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func removePathFromRegistry(path string) error {
131131
k, err := registry.OpenKey(registry.CURRENT_USER, Environment, registry.READ|registry.WRITE)
132132
if err != nil {
133133
if errors.Is(err, fs.ErrNotExist) {
134-
// Nothing to cleanup, the Environment registry key does not exist.
134+
// Nothing to clean up, the Environment registry key does not exist.
135135
return nil
136136
}
137137
return err

commands-demo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| [podman-commit(1)](https://podman.readthedocs.io/en/latest/markdown/podman-commit.1.html) | Create new image based on the changed container |
1212
| [podman-container(1)](https://podman.readthedocs.io/en/latest/managecontainers.html) | Manage Containers |
1313
| [podman-container-checkpoint(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-checkpoint.1.html) | Checkpoints one or more running containers |
14-
| [podman-container-cleanup(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-cleanup.1.html) | Cleanup the container's network and mountpoints |
14+
| [podman-container-cleanup(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-cleanup.1.html) | Clean up the container's network and mountpoints |
1515
| [podman-container-exists(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-exists.1.html) | Check if an container exists in local storage |
1616
| [podman-container-prune(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-prune.1.html) | Remove all stopped containers from local storage |
1717
| [podman-container-restore(1)](https://podman.readthedocs.io/en/latest/markdown/podman-container-restore.1.html) | Restores one or more containers from a checkpoint |

contrib/cirrus/lib.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ setup_rootless() {
173173
ssh-keygen -t ed25519 -P "" -f "/home/$ROOTLESS_USER/.ssh/id_ed25519"
174174
ssh-keygen -t rsa -P "" -f "/home/$ROOTLESS_USER/.ssh/id_rsa"
175175

176-
msg "Setup authorized_keys"
176+
msg "Set up authorized_keys"
177177
cat $HOME/.ssh/*.pub /home/$ROOTLESS_USER/.ssh/*.pub >> $HOME/.ssh/authorized_keys
178178
cat $HOME/.ssh/*.pub /home/$ROOTLESS_USER/.ssh/*.pub >> /home/$ROOTLESS_USER/.ssh/authorized_keys
179179

@@ -186,9 +186,9 @@ setup_rootless() {
186186
# never be any non-localhost connections made from tests (using strict-mode).
187187
# If there are, it's either a security problem or a broken test, both of which
188188
# we want to lead to test failures.
189-
msg " setup known_hosts for $USER"
189+
msg " set up known_hosts for $USER"
190190
ssh-keyscan localhost > /root/.ssh/known_hosts
191-
msg " setup known_hosts for $ROOTLESS_USER"
191+
msg " set up known_hosts for $ROOTLESS_USER"
192192
# Maintain access-permission consistency with all other .ssh files.
193193
install -Z -m 700 -o $ROOTLESS_USER -g $ROOTLESS_USER \
194194
/root/.ssh/known_hosts /home/$ROOTLESS_USER/.ssh/known_hosts

0 commit comments

Comments
 (0)