summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2018-06-09 15:04:38 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-11 20:38:37 +0000
commit9b72746f9a3f0f76e6777ca21032dfad33d1bc72 (patch)
treeac9b16ae261a15a4c0fc72601cb1502940cdbbd1 /docs
parent1e9e530714ac0a8329dc27e38034380d81247e36 (diff)
downloadpodman-9b72746f9a3f0f76e6777ca21032dfad33d1bc72.tar.gz
podman-9b72746f9a3f0f76e6777ca21032dfad33d1bc72.tar.bz2
podman-9b72746f9a3f0f76e6777ca21032dfad33d1bc72.zip
Touchups for registries.conf across a few man pages
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Closes: #927 Approved by: rhatdan
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-build.1.md4
-rw-r--r--docs/podman-info.1.md4
-rw-r--r--docs/podman-pull.1.md7
-rw-r--r--docs/podman-search.1.md7
-rw-r--r--docs/podman.1.md4
5 files changed, 18 insertions, 8 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md
index 1a95a4e23..bdad555d2 100644
--- a/docs/podman-build.1.md
+++ b/docs/podman-build.1.md
@@ -416,10 +416,10 @@ podman build --volume /home/test:/myvol:ro,Z -t imageName .
**registries.conf** (`/etc/containers/registries.conf`)
-registries.conf is the configuration file which specifies which registries should be consulted when completing image names which do not include a registry or domain portion.
+registries.conf is the configuration file which specifies which container registries should be consulted when completing image names which do not include a registry or domain portion.
## SEE ALSO
-podman(1), buildah(1)
+podman(1), buildah(1), registries.conf(5)
## HISTORY
diff --git a/docs/podman-info.1.md b/docs/podman-info.1.md
index e8d9e0c20..7ab9cd7a7 100644
--- a/docs/podman-info.1.md
+++ b/docs/podman-info.1.md
@@ -10,7 +10,7 @@ podman\-info - Display system information
## DESCRIPTION
-Displays information pertinent to the host, current storage stats, configured registries, and build of podman.
+Displays information pertinent to the host, current storage stats, configured container registries, and build of podman.
## OPTIONS
@@ -93,4 +93,4 @@ map[registries:[docker.io registry.fedoraproject.org registry.access.redhat.com]
```
## SEE ALSO
-podman(1), crio(8)
+podman(1), registries.conf(5), storage.conf(5), crio(8)
diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md
index 712c6e395..0061dfc70 100644
--- a/docs/podman-pull.1.md
+++ b/docs/podman-pull.1.md
@@ -136,9 +136,14 @@ Writing manifest to image destination
Storing signatures
03290064078cb797f3e0a530e78c20c13dd22a3dd3adf84a5da2127b48df0438
```
+## FILES
+
+**registries.conf** (`/etc/containers/registries.conf`)
+
+ registries.conf is the configuration file which specifies which container registries should be consulted when completing image names which do not include a registry or domain portion.
## SEE ALSO
-podman(1), podman-push(1), podman-login(1), crio(8)
+podman(1), podman-push(1), podman-login(1), registries.conf(5), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-search.1.md b/docs/podman-search.1.md
index 050443e49..c2d802c54 100644
--- a/docs/podman-search.1.md
+++ b/docs/podman-search.1.md
@@ -105,9 +105,14 @@ INDEX NAME
fedoraproject.org fedoraproject.org/fedora
fedoraproject.org fedoraproject.org/fedora-minimal
```
+## FILES
+
+**registries.conf** (`/etc/containers/registries.conf`)
+
+ registries.conf is the configuration file which specifies which container registries should be consulted when completing image names which do not include a registry or domain portion.
## SEE ALSO
-podman(1), crio(8)
+podman(1), registries.conf(5), crio(8)
## HISTORY
January 2018, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman.1.md b/docs/podman.1.md
index 61337d893..d19dd6060 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -132,10 +132,10 @@ has the capability to debug pods/images created by crio.
**registries.conf** (`/etc/containers/registries.conf`)
- registries.conf is the configuration file which specifies which registries should be consulted when completing image names which do not include a registry or domain portion.
+ registries.conf is the configuration file which specifies which container registries should be consulted when completing image names which do not include a registry or domain portion.
## SEE ALSO
-`oci-hooks(5)`, `storage.conf(5)`, `crio(8)`
+`oci-hooks(5)`, `registries.conf(5)`, `storage.conf(5)`, `crio(8)`
## HISTORY
Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com>