summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-17 12:45:18 +0100
committerGitHub <noreply@github.com>2022-01-17 12:45:18 +0100
commitea2656dc8658f99a0e9be2342557763e974513b9 (patch)
tree83b0975de8ea43179521cc7b119631af4106c96a /contrib
parent08c288e96b9e2e81c0e030f51adcd9e48bab757b (diff)
parentd6e55577cf1444585288a8c63c9c04a2a9a9f288 (diff)
downloadpodman-ea2656dc8658f99a0e9be2342557763e974513b9.tar.gz
podman-ea2656dc8658f99a0e9be2342557763e974513b9.tar.bz2
podman-ea2656dc8658f99a0e9be2342557763e974513b9.zip
Merge pull request #12880 from eriksjolund/replace_master_branch_links_with_main_branch_links_in_docs
[CI:DOCS] fix default branch links
Diffstat (limited to 'contrib')
-rw-r--r--contrib/snapcraft/snap/snapcraft.yaml2
-rw-r--r--contrib/systemd/README.md8
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/snapcraft/snap/snapcraft.yaml b/contrib/snapcraft/snap/snapcraft.yaml
index e3948e01b..57589b00e 100644
--- a/contrib/snapcraft/snap/snapcraft.yaml
+++ b/contrib/snapcraft/snap/snapcraft.yaml
@@ -17,7 +17,7 @@ parts:
source: https://github.com/containers/podman/archive/v0.11.1.1.tar.gz
go-importpath: github.com/containers/podman
build-packages:
- # https://github.com/containers/podman/blob/master/install.md#build-and-run-dependencies
+ # https://github.com/containers/podman/blob/main/install.md#build-and-run-dependencies
- btrfs-tools
- git
- golang-go
diff --git a/contrib/systemd/README.md b/contrib/systemd/README.md
index 480596915..af5ae0218 100644
--- a/contrib/systemd/README.md
+++ b/contrib/systemd/README.md
@@ -11,9 +11,9 @@
Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock`
### podman.service
-You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/system/podman.service) for a sample podman.service file.
+You can refer to [this example](https://github.com/containers/podman/blob/main/contrib/systemd/system/podman.service) for a sample podman.service file.
### podman.socket
-You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/system/podman.socket) for a sample podman.socket file.
+You can refer to [this example](https://github.com/containers/podman/blob/main/contrib/systemd/system/podman.socket) for a sample podman.socket file.
## user (podman service run as given user aka "rootless")
@@ -26,7 +26,7 @@ You can refer to [this example](https://github.com/containers/podman/blob/master
Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock`
### podman.service
-You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/user/podman.service) for a rootless podman.service file.
+You can refer to [this example](https://github.com/containers/podman/blob/main/contrib/systemd/user/podman.service) for a rootless podman.service file.
### podman.socket
-You can refer to [this example](https://github.com/containers/podman/blob/master/contrib/systemd/user/podman.socket) for a rootless podman.socket file.
+You can refer to [this example](https://github.com/containers/podman/blob/main/contrib/systemd/user/podman.socket) for a rootless podman.socket file.