diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-22 18:10:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 18:10:17 +0200 |
| commit | 8cd4ecad2e8d15720159f74a606f0785a85ef4df (patch) | |
| tree | b076ddb563289463229b500ff610a1de3ba92c1f /docs | |
| parent | f53234a67eac066e3ea59ed225b866e0597debb9 (diff) | |
| parent | 10d6586cb7e61417f67ad9e259ef8225cc2710fa (diff) | |
| download | podman-8cd4ecad2e8d15720159f74a606f0785a85ef4df.tar.gz podman-8cd4ecad2e8d15720159f74a606f0785a85ef4df.tar.bz2 podman-8cd4ecad2e8d15720159f74a606f0785a85ef4df.zip | |
Merge pull request #14957 from edsantiago/dont_remake_remote
Makefile: use order-only prereq for podman-remote
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/remote-docs.sh | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-import.1.md | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/remote-docs.sh b/docs/remote-docs.sh index 4c2602f80..f281c19ff 100755 --- a/docs/remote-docs.sh +++ b/docs/remote-docs.sh @@ -6,7 +6,9 @@ PLATFORM=$1 ## linux, windows or darwin TARGET=${2} ## where to output files SOURCES=${@:3} ## directories to find markdown files -# Overridden for testing. Native podman-remote binary expected filepaths +# This is a *native* binary, one we can run on this host. (This script can be +# invoked in a cross-compilation environment, so even if PLATFORM=windows +# we need an actual executable that we can invoke). if [[ -z "$PODMAN" ]]; then case $(env -i HOME=$HOME PATH=$PATH go env GOOS) in windows) diff --git a/docs/source/markdown/podman-import.1.md b/docs/source/markdown/podman-import.1.md index 4002f5255..8d482b961 100644 --- a/docs/source/markdown/podman-import.1.md +++ b/docs/source/markdown/podman-import.1.md @@ -50,10 +50,6 @@ Shows progress on the import Set variant of the imported image. -**--verbose** - -Print additional debugging information - ## EXAMPLES ``` |