summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-30 16:50:45 +0100
committerGitHub <noreply@github.com>2020-10-30 16:50:45 +0100
commit3db54bacaa479bb4ef3bbdea724f892b08cd76d1 (patch)
tree94d6bb682f4d5378bb152116f2f65730d7f3dfb4
parentf794a4f03f76c4de7f2012d09ff65814612a2336 (diff)
parent611c0cb0e0444b862d2a49031480337b8f6ce9fb (diff)
downloadpodman-3db54bacaa479bb4ef3bbdea724f892b08cd76d1.tar.gz
podman-3db54bacaa479bb4ef3bbdea724f892b08cd76d1.tar.bz2
podman-3db54bacaa479bb4ef3bbdea724f892b08cd76d1.zip
Merge pull request #8199 from cevich/fix_missing_links
[CI:DOCS] Fix broken CI readme links
-rw-r--r--CONTRIBUTING.md3
-rw-r--r--README.md2
-rw-r--r--docs/Readme.md5
3 files changed, 3 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a813fcc35..308c7b197 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -361,9 +361,6 @@ All pull requests and branch-merges automatically run:
* Integration Testing
* Special testing (like running inside a container, or as a regular user)
-For a more in-depth reference of the CI system, please [refer to it's dedicated
-documentation.](contrib/cirrus/README.md)
-
There is always additional complexity added by automation, and so it sometimes
can fail for any number of reasons. This includes post-merge testing on all
branches, which you may occasionally see [red bars on the status graph
diff --git a/README.md b/README.md
index ef844ac74..18da18465 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Podman is based on libpod, a library for container lifecycle management that is
* Latest Remote client for MacOs
* Latest Static Remote client for Linux
-* [Continuous Integration:](contrib/cirrus/README.md) [![Build Status](https://api.cirrus-ci.com/github/containers/podman.svg)](https://cirrus-ci.com/github/containers/podman/master)
+* Continuous Integration: [![Build Status](https://api.cirrus-ci.com/github/containers/podman.svg)](https://cirrus-ci.com/github/containers/podman/master)
* [GoDoc: ![GoDoc](https://godoc.org/github.com/containers/podman/libpod?status.svg)](https://godoc.org/github.com/containers/podman/libpod)
## Overview and scope
diff --git a/docs/Readme.md b/docs/Readme.md
index 12b78d48f..c517052b3 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -50,6 +50,5 @@ the following:
If reloading the page, or clearing your local cache does not fix the problem, it is
likely caused by broken metadata needed to protect clients from cross-site-scripting
style attacks. Please [notify a maintainer](https://github.com/containers/podman#communications)
-so they may investigate how/why the swagger.yaml file's CORS-metadata is incorrect. See
-[the Cirrus-CI tasks documentation](../contrib/cirrus/README.md#docs-task) for
-details regarding this situation.
+so they may investigate how/why the `swagger.yaml` file's CORS-metadata is
+incorrect, or the file isn't accessable for some other reason.