summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-20 05:56:10 +0200
committerGitHub <noreply@github.com>2019-09-20 05:56:10 +0200
commit45b072510220d3bab467c43ca3707ef3cebd8ba9 (patch)
tree09dd84c9cb50923234b1432d5ec42de111658cc2
parente155162e4506d14b2cd77f46bc456c7cce71f125 (diff)
parent9f84d2ee27e4bb5376443b8854996f07eed08052 (diff)
downloadpodman-45b072510220d3bab467c43ca3707ef3cebd8ba9.tar.gz
podman-45b072510220d3bab467c43ca3707ef3cebd8ba9.tar.bz2
podman-45b072510220d3bab467c43ca3707ef3cebd8ba9.zip
Merge pull request #4064 from TomSweeneyRedHat/dev/tsweeney/tutfix
Move rootless and Mac to Tutorials page
-rw-r--r--README.md4
-rw-r--r--docs/tutorials/README.md8
-rw-r--r--docs/tutorials/mac_client.md (renamed from mac_client.md)0
-rw-r--r--docs/tutorials/remote_client.md (renamed from remote_client.md)4
4 files changed, 10 insertions, 6 deletions
diff --git a/README.md b/README.md
index f04dd75d5..4cdccd3a9 100644
--- a/README.md
+++ b/README.md
@@ -102,10 +102,10 @@ includes tables showing Docker commands and their Podman equivalent commands.
**[Tutorials](docs/tutorials)**
Tutorials on using Podman.
-**[Remote Client](remote_client.md)**
+**[Remote Client](https://github.com/containers/libpod/blob/master/docs/tutorials/remote_client.md)**
A brief how-to on using the Podman remote-client.
-**[Basic Setup and Use of Podman in a Rootless environment](https://github.com/containers/libpod/blob/master/docs/tutorials/rootless_tutorial.md)
+**[Basic Setup and Use of Podman in a Rootless environment](https://github.com/containers/libpod/blob/master/docs/tutorials/rootless_tutorial.md)**
A tutorial showing the setup and configuration necessary to run Rootless Podman.
**[Release Notes](RELEASE_NOTES.md)**
diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md
index 5dc01f794..c340d683f 100644
--- a/docs/tutorials/README.md
+++ b/docs/tutorials/README.md
@@ -12,6 +12,10 @@ Learn how to setup Podman and perform some basic commands with the utility.
The steps required to setup rootless Podman are enumerated.
-**[Setup on OS X](https://github.com/containers/libpod/blob/master/mac_client.md)**
+**[Setup on OS X](https://github.com/containers/libpod/blob/master/doc/tutorials/mac_client.md)**
-Special setup for running the Podman remote client on a Mac and connecting to Podman running on a Linux VM are documented \ No newline at end of file
+Special setup for running the Podman remote client on a Mac and connecting to Podman running on a Linux VM are documented
+
+**[Remote Client](https://github.com/containers/libpod/blob/master/doc/tutorials/remote_client.md)**
+
+A brief how-to on using the Podman remote-client.
diff --git a/mac_client.md b/docs/tutorials/mac_client.md
index bf08e8cc1..bf08e8cc1 100644
--- a/mac_client.md
+++ b/docs/tutorials/mac_client.md
diff --git a/remote_client.md b/docs/tutorials/remote_client.md
index be5c918c8..197ff3d26 100644
--- a/remote_client.md
+++ b/docs/tutorials/remote_client.md
@@ -19,8 +19,8 @@ system as a user with privileges to the varlink socket (more on this later).
## Building the remote client
At this time, the remote-client is not being packaged for any distribution. It must be built from
-source. To set up your build environment, see [Installation notes](install.md) and follow the
-section [Building from scratch](install.md#building-from-scratch). Once you can successfully
+source. To set up your build environment, see [Installation notes](https://github.com/containers/libpod/blob/master/install.md) and follow the
+section [Building from scratch](https://github.com/containers/libpod/blob/master/install.md#building-from-scratch). Once you can successfully
build the regular Podman binary, you can now build the remote-client.
```
$ make podman-remote