summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-03-12 10:00:14 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-12 14:38:41 +0000
commitb78a450cd5e0cf3e65ec7cd61bea4af6e5071e1c (patch)
treef42e4bb1d25d1f68ee2bff55e6c721282a74867a
parentc1d00ff329be91bd6f5e97ea904e31d1fb8267ad (diff)
downloadpodman-b78a450cd5e0cf3e65ec7cd61bea4af6e5071e1c.tar.gz
podman-b78a450cd5e0cf3e65ec7cd61bea4af6e5071e1c.tar.bz2
podman-b78a450cd5e0cf3e65ec7cd61bea4af6e5071e1c.zip
Remove crio.conf references from manpages
Also changes a few docker-login references to podman-login. Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #473 Approved by: rhatdan
-rw-r--r--.gitignore1
-rw-r--r--docs/podman-export.1.md2
-rw-r--r--docs/podman-history.1.md2
-rw-r--r--docs/podman-import.1.md2
-rw-r--r--docs/podman-info.1.md2
-rw-r--r--docs/podman-load.1.md2
-rw-r--r--docs/podman-login.1.md2
-rw-r--r--docs/podman-logout.1.md2
-rw-r--r--docs/podman-ps.1.md2
-rw-r--r--docs/podman-pull.1.md2
-rw-r--r--docs/podman-push.1.md2
-rw-r--r--docs/podman-save.1.md2
-rw-r--r--docs/podman-search.1.md2
-rw-r--r--docs/podman-tag.1.md2
-rw-r--r--docs/podman-version.1.md2
-rw-r--r--docs/podman-wait.1.md2
-rw-r--r--docs/podman.1.md2
17 files changed, 16 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 82ba15869..cc7e7bd3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
/conmon/conmon.o
/docs/*.[158]
/docs/*.[158].gz
-/crio.conf
*.o
*.orig
/pause/pause.o
diff --git a/docs/podman-export.1.md b/docs/podman-export.1.md
index ae6e6024c..142c45390 100644
--- a/docs/podman-export.1.md
+++ b/docs/podman-export.1.md
@@ -38,7 +38,7 @@ Write to a file, default is STDOUT
```
## SEE ALSO
-podman(1), podman-import(1), crio(8), crio.conf(5)
+podman(1), podman-import(1), crio(8)
## HISTORY
August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-history.1.md b/docs/podman-history.1.md
index 0a07be699..cf234ffc4 100644
--- a/docs/podman-history.1.md
+++ b/docs/podman-history.1.md
@@ -100,7 +100,7 @@ b676ca55e4f2c 9 weeks ago
Show the history of an image
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-import.1.md b/docs/podman-import.1.md
index 8ace15f83..f311dc222 100644
--- a/docs/podman-import.1.md
+++ b/docs/podman-import.1.md
@@ -83,7 +83,7 @@ db65d991f3bbf7f31ed1064db9a6ced7652e3f8166c4736aa9133dadd3c7acb3
```
## SEE ALSO
-podman(1), podman-export(1), crio(8), crio.conf(5)
+podman(1), podman-export(1), crio(8)
## HISTORY
November 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-info.1.md b/docs/podman-info.1.md
index 2f5a36c83..2806ee7af 100644
--- a/docs/podman-info.1.md
+++ b/docs/podman-info.1.md
@@ -95,4 +95,4 @@ map[registries:[docker.io registry.fedoraproject.org registry.access.redhat.com]
```
## SEE ALSO
-crio(8), crio.conf(5)
+podman(1), crio(8)
diff --git a/docs/podman-load.1.md b/docs/podman-load.1.md
index 4b0cf4017..2ae82482e 100644
--- a/docs/podman-load.1.md
+++ b/docs/podman-load.1.md
@@ -72,7 +72,7 @@ Loaded image: registry.fedoraproject.org/fedora:latest
```
## SEE ALSO
-podman(1), podman-save(1), crio(8), crio.conf(5)
+podman(1), podman-save(1), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-login.1.md b/docs/podman-login.1.md
index b22a02553..3942d3211 100644
--- a/docs/podman-login.1.md
+++ b/docs/podman-login.1.md
@@ -76,7 +76,7 @@ Login Succeeded!
```
## SEE ALSO
-podman(1), podman-logout(1), crio(8), crio.conf(5)
+podman(1), podman-logout(1), crio(8)
## HISTORY
August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-logout.1.md b/docs/podman-logout.1.md
index 92abaa22e..353e19678 100644
--- a/docs/podman-logout.1.md
+++ b/docs/podman-logout.1.md
@@ -50,7 +50,7 @@ Remove login credentials for all registries
```
## SEE ALSO
-podman(1), podman-login(1), crio(8), crio.conf(5)
+podman(1), podman-login(1), crio(8)
## HISTORY
August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-ps.1.md b/docs/podman-ps.1.md
index 90f16d9a9..dced70f38 100644
--- a/docs/podman-ps.1.md
+++ b/docs/podman-ps.1.md
@@ -125,7 +125,7 @@ a31ebbee9cee7 k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-c
Print a list of containers
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md
index f7b24995a..6f46fdf86 100644
--- a/docs/podman-pull.1.md
+++ b/docs/podman-pull.1.md
@@ -138,7 +138,7 @@ Storing signatures
```
## SEE ALSO
-podman(1), podman-push(1), crio(8), crio.conf(5), docker-login(1)
+podman(1), podman-push(1), podman-login(1), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md
index 964758da6..524b33d10 100644
--- a/docs/podman-push.1.md
+++ b/docs/podman-push.1.md
@@ -141,4 +141,4 @@ Storing signatures
```
## SEE ALSO
-podman(1), podman-pull(1), crio(8), crio.conf(5), docker-login(1)
+podman(1), podman-pull(1), podman-login(1), crio(8)
diff --git a/docs/podman-save.1.md b/docs/podman-save.1.md
index 280073e74..6791d8ba3 100644
--- a/docs/podman-save.1.md
+++ b/docs/podman-save.1.md
@@ -91,7 +91,7 @@ Storing signatures
```
## SEE ALSO
-podman(1), podman-load(1), crio(8), crio.conf(5)
+podman(1), podman-load(1), 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 668748d3f..1705ca6c2 100644
--- a/docs/podman-search.1.md
+++ b/docs/podman-search.1.md
@@ -109,7 +109,7 @@ fedoraproject.org fedoraproject.org/fedora-minimal
```
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
January 2018, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-tag.1.md b/docs/podman-tag.1.md
index 12afb4b91..2ac5e01af 100644
--- a/docs/podman-tag.1.md
+++ b/docs/podman-tag.1.md
@@ -22,7 +22,7 @@ the IMAGE and the TARGET_NAME.
podman tag httpd myregistryhost:5000/fedora/httpd:v2
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
July 2017, Originally compiled by Ryan Cole <rycole@redhat.com>
diff --git a/docs/podman-version.1.md b/docs/podman-version.1.md
index 8978da630..2c9f2719a 100644
--- a/docs/podman-version.1.md
+++ b/docs/podman-version.1.md
@@ -18,7 +18,7 @@ OS, and Architecture.
**podman version**
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com>
diff --git a/docs/podman-wait.1.md b/docs/podman-wait.1.md
index 31735b7b5..d69f2e774 100644
--- a/docs/podman-wait.1.md
+++ b/docs/podman-wait.1.md
@@ -36,7 +36,7 @@ to run containers such as CRI-O, the last started container could be from either
podman wait mywebserver myftpserver
## SEE ALSO
-podman(1), crio(8), crio.conf(5)
+podman(1), crio(8)
## HISTORY
September 2017, Originally compiled by Brent Baude<bbaude@redhat.com>
diff --git a/docs/podman.1.md b/docs/podman.1.md
index ad9138a1d..2c24b654c 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -152,7 +152,7 @@ Display the version information
Wait on one or more containers to stop and print their exit codes
## SEE ALSO
-crio(8), crio.conf(5)
+crio(8)
## HISTORY
Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com>