diff --git a/README.md b/README.md index cecd706f13..c73c936d02 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ A little configuration by an administrator is required before rootless Podman ca ## Podman Desktop -[Podman Desktop](https://podman-desktop.io/) is a new project under the container organization built to help the developers working with containers from their local environment with a desktop UI. Podman Desktop is still in its early days, but already provides capabilities to list your images, interact with containers (access logs, get a terminal), connect to registries (pull private images, push your images) and configure podman settings (proxies). The project develops on [Github](https://github.com/containers/podman-desktop) and contributors are welcome. +[Podman Desktop](https://podman-desktop.io/) is a new project under the container organization built to help the developers working with containers from their local environment with a desktop UI. Podman Desktop is still in its early days, but already provides capabilities to list your images, interact with containers (access logs, get a terminal), connect to registries (pull private images, push your images) and configure podman settings (proxies). The project develops on [GitHub](https://github.com/containers/podman-desktop) and contributors are welcome. ## Out of scope diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7117b44a3a..7a3193e914 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -284,7 +284,7 @@ - Fixed a bug in podman-remote logs to correctly display errors reported by the server. - Fixed a bug to correctly tear down the network stack again when an error happened during the setup. - Fixed a bug in the remote API exec inspect call to correctly display updated information, e.g. when the exec process died ([#18424](https://github.com/containers/podman/issues/18424)). -- Fixed a bug so that podman save on windows can now write to stdout by default ([#18147](https://github.com/containers/podman/issues/18147)). +- Fixed a bug so that podman save on Windows can now write to stdout by default ([#18147](https://github.com/containers/podman/issues/18147)). - Fixed a bug where podman machine rm with the qemu backend now correctly removes the machine connection after the confirmation message not before ([#18330](https://github.com/containers/podman/issues/18330)). - Fixed a problem where podman machine connections would try to connect to the ipv6 localhost ipv6 (::1) ([#16470](https://github.com/containers/podman/issues/16470)). @@ -640,7 +640,7 @@ - Fixed a bug where the `--filter "{{.Config.Healthcheck}}"` option to `podman image inspect` did not print the image's configured healthcheck ([#14661](https://github.com/containers/podman/issues/14661)). - Fixed a bug where the `podman volume create -o timeout=` option could be specified even when no volume plugin was in use. - Fixed a bug where the `podman rmi` command did not emit `untag` events when removing tagged images ([#15485](https://github.com/containers/podman/issues/15485)). -- Fixed a bug where API forwarding with `podman machine` VMs on windows could sometimes fail because the pipe was not created in time ([#14811](https://github.com/containers/podman/issues/14811)). +- Fixed a bug where API forwarding with `podman machine` VMs on Windows could sometimes fail because the pipe was not created in time ([#14811](https://github.com/containers/podman/issues/14811)). - Fixed a bug where the `podman pod rm` command could error if removal of a container in the pod was interrupted by a reboot. - Fixed a bug where the `exited` and `exec died` events for containers did not include the container's labels ([#15617](https://github.com/containers/podman/issues/15617)). - Fixed a bug where running Systemd containers on a system not using Systemd as PID 1 could fail ([#15647](https://github.com/containers/podman/issues/15647)). @@ -716,7 +716,7 @@ ## 4.2.0 ### Features -- Podman now supports the Gitlab Runner (using the Docker executor), allowing its use in Gitlab CI/CD pipelines. +- Podman now supports the GitLab Runner (using the Docker executor), allowing its use in GitLab CI/CD pipelines. - A new command has been added, `podman pod clone`, to create a copy of an existing pod. It supports several options, including `--start` to start the new pod, `--destroy` to remove the original pod, and `--name` to change the name of the new pod ([#12843](https://github.com/containers/podman/issues/12843)). - A new command has been added, `podman volume reload`, to sync changes in state between Podman's database and any configured volume plugins ([#14207](https://github.com/containers/podman/issues/14207)). - A new command has been added, `podman machine info`, which displays information about the host and the versions of various machine components. @@ -791,7 +791,7 @@ - Fixed a bug where Podman Machine VMs with proxy variables could not be started more than once ([#14636](https://github.com/containers/podman/issues/14636) and [#14837](https://github.com/containers/podman/issues/14837)). - Fixed a bug where containers created using the Podman API would, when the Podman API service was managed by systemd, be killed when the API service was stopped ([BZ 2052697](https://bugzilla.redhat.com/show_bug.cgi?id=2052697)). - Fixed a bug where the `podman -h` command did not show help output. -- Fixed a bug where the `podman wait` command (and the associated REST API endpoint) could return before a container had fully exited, breaking some tools like the Gitlab Runner. +- Fixed a bug where the `podman wait` command (and the associated REST API endpoint) could return before a container had fully exited, breaking some tools like the GitLab Runner. - Fixed a bug where healthchecks generated `exec` events, instead of `health_status` events ([#13493](https://github.com/containers/podman/issues/13493)). - Fixed a bug where the `podman pod ps` command could return an error when run at the same time as `podman pod rm` ([#14736](https://github.com/containers/podman/issues/14736)). - Fixed a bug where the `podman systemd df` command incorrectly calculated reclaimable storage for volumes ([#13516](https://github.com/containers/podman/issues/13516)). @@ -1219,7 +1219,7 @@ - Numerous small changes have been made to ensure that the API matches its Swagger documentation ### Misc -- The Windows installer MSI distributed through Github releases no longer supports 32-bit systems, as Podman is built only for 64-bit machines. +- The Windows installer MSI distributed through GitHub releases no longer supports 32-bit systems, as Podman is built only for 64-bit machines. - Updated Buildah to v1.24.0 - Updated the containers/image library to v5.19.0 - Updated the containers/storage library to v1.38.1 diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 386c6d34d3..eecab97028 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -231,7 +231,7 @@ spelled with complete minutiae. 1. Update `RELEASE_NOTES.md` on main. Commit these changes. 1. Create a PR with the above commits, and oversee it's merging. -1. Create Github Release entry and upload assets +1. Create GitHub Release entry and upload assets 1. Return to the Cirrus-CI Build page for the new release tag, confirm (or wait for) it to complete, re-running any failed tasks as appropriate. diff --git a/build_windows.md b/build_windows.md index a5d0d88842..3a95b45b96 100644 --- a/build_windows.md +++ b/build_windows.md @@ -15,7 +15,7 @@ this distribution and will have to be manually added after this installation com Pandoc could be installed from https://pandoc.org/installing.html When performing the Pandoc installation one, has to choose the option "Install for all users" (to put the binaries into "Program Files" directory). -## Install WiX Toolset v3 (is preinstalled in Github runner) +## Install WiX Toolset v3 (is preinstalled in GitHub runner) The latest release of the WiX Toolset can be obtained from https://wixtoolset.org/docs/wix3/. Installing it into a clean VM might require an additional installation of .NET Framework 3.5 in advance ([instructions for adding .NET Framework 3.5 via enabling the Windows feature](https://learn.microsoft.com/en-us/dotnet/framework/install/dotnet-35-windows#enable-the-net-framework-35-in-control-panel)) diff --git a/docs/source/locale/ja/LC_MESSAGES/markdown.po b/docs/source/locale/ja/LC_MESSAGES/markdown.po index 9f8ba2a10b..d625c9c3e5 100644 --- a/docs/source/locale/ja/LC_MESSAGES/markdown.po +++ b/docs/source/locale/ja/LC_MESSAGES/markdown.po @@ -1745,7 +1745,7 @@ msgstr "" msgid "" "Local directory – e.g. --build-context project2=../path/to/project2/src " "(This option is not available with the remote Podman client. On Podman " -"machine setup (i.e macOS and Winows) path must exists on the machine VM)" +"machine setup (i.e macOS and Windows) path must exists on the machine VM)" msgstr "" #: ../../source/markdown/podman-build.1.md:130 @@ -3782,7 +3782,7 @@ msgstr "" #: ../../source/markdown/podman-build.1.md:884 msgid "" -"Adds global flags for the container rutime. To list the supported flags, " +"Adds global flags for the container runtime. To list the supported flags, " "please consult the manpages of the selected container runtime." msgstr "" @@ -4484,10 +4484,10 @@ msgstr "" #: ../../source/markdown/podman-build.1.md:1332 msgid "" -"Note: Github does not support using `git://` for performing `clone` " +"Note: GitHub does not support using `git://` for performing `clone` " "operation due to recent changes in their security guidance " "(https://github.blog/2021-09-01-improving-git-protocol-security-github/)." -" Use an `https://` URL if the source repository is hosted on Github." +" Use an `https://` URL if the source repository is hosted on GitHub." msgstr "" #: ../../source/markdown/podman-build.1.md:1334 @@ -18197,7 +18197,7 @@ msgid ".SSHConfig ..." msgstr "" #: ../../source/markdown/podman-machine-inspect.1.md:1 -msgid "SSH configuration info for communitating with machine" +msgid "SSH configuration info for communicating with machine" msgstr "" #: ../../source/markdown/podman-machine-inspect.1.md:1 diff --git a/docs/source/markdown/options/build-context.md b/docs/source/markdown/options/build-context.md index a56a468d0d..5fb5a1dc76 100644 --- a/docs/source/markdown/options/build-context.md +++ b/docs/source/markdown/options/build-context.md @@ -10,7 +10,7 @@ different stages in COPY instruction. Valid values are: -* Local directory – e.g. --build-context project2=../path/to/project2/src (This option is not available with the remote Podman client. On Podman machine setup (i.e macOS and Winows) path must exists on the machine VM) +* Local directory – e.g. --build-context project2=../path/to/project2/src (This option is not available with the remote Podman client. On Podman machine setup (i.e macOS and Windows) path must exists on the machine VM) * HTTP URL to a tarball – e.g. --build-context src=https://example.org/releases/src.tar * Container image – specified with a container-image:// prefix, e.g. --build-context alpine=container-image://alpine:3.15, (also accepts docker://, docker-image://) diff --git a/docs/source/markdown/options/runtime-flag.md b/docs/source/markdown/options/runtime-flag.md index 6d14f6c68d..00347c1f0d 100644 --- a/docs/source/markdown/options/runtime-flag.md +++ b/docs/source/markdown/options/runtime-flag.md @@ -4,6 +4,6 @@ ####> are applicable to all of those. #### **--runtime-flag**=*flag* -Adds global flags for the container rutime. To list the supported flags, please consult the manpages of the selected container runtime. +Adds global flags for the container runtime. To list the supported flags, please consult the manpages of the selected container runtime. Note: Do not pass the leading -- to the flag. To pass the runc flag --log-format json to buildah build, the option given is --runtime-flag log-format=json. diff --git a/docs/source/markdown/podman-build.1.md.in b/docs/source/markdown/podman-build.1.md.in index 0e013dea9d..c96f1618c7 100644 --- a/docs/source/markdown/podman-build.1.md.in +++ b/docs/source/markdown/podman-build.1.md.in @@ -474,7 +474,7 @@ $ podman build -t hello https://github.com/containers/PodmanHello.git $ podman run hello ``` - Note: Github does not support using `git://` for performing `clone` operation due to recent changes in their security guidance (https://github.blog/2021-09-01-improving-git-protocol-security-github/). Use an `https://` URL if the source repository is hosted on Github. + Note: GitHub does not support using `git://` for performing `clone` operation due to recent changes in their security guidance (https://github.blog/2021-09-01-improving-git-protocol-security-github/). Use an `https://` URL if the source repository is hosted on GitHub. #### Building an image using a URL to an archive diff --git a/docs/source/markdown/podman-machine-inspect.1.md b/docs/source/markdown/podman-machine-inspect.1.md index f8b5bd8ffa..0d5a75e7fd 100644 --- a/docs/source/markdown/podman-machine-inspect.1.md +++ b/docs/source/markdown/podman-machine-inspect.1.md @@ -33,7 +33,7 @@ Print results with a Go template. | .Name | Name of the machine | | .Resources ... | Resources used by the machine | | .Rootful | Whether the machine prefers rootful or rootless container execution | -| .SSHConfig ... | SSH configuration info for communitating with machine | +| .SSHConfig ... | SSH configuration info for communicating with machine | | .State ... | Machine state | | .UserModeNetworking | Whether this machine uses user-mode networking | diff --git a/docs/tutorials/podman-for-windows.md b/docs/tutorials/podman-for-windows.md index 98ed646051..34489c271e 100644 --- a/docs/tutorials/podman-for-windows.md +++ b/docs/tutorials/podman-for-windows.md @@ -40,7 +40,7 @@ Installing Podman Installing the Windows Podman client begins by downloading the Podman Windows installer. The Windows installer is built with each Podman release and can be downloaded from the official - [Github release page](https://github.com/containers/podman/releases). + [GitHub release page](https://github.com/containers/podman/releases). Be sure to download a 4.1 or later release for the capabilities discussed in this guide.