summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2019-12-08 21:37:09 -0800
committerGitHub <noreply@github.com>2019-12-08 21:37:09 -0800
commitbfdd288a81fbfdc3403170f1554cf493823176af (patch)
tree9e9125c7a800ab47abc489c37eed4c93ee14ace8
parent1922998843eb61d13eb41d6303e36e5e206a1cee (diff)
parentd99ad6fd64e7fb0686d65c82ae05d0580af74c2e (diff)
Merge pull request #4297 from justaugustus/md-style
contribex: Tombstone old Markdown style guide
-rw-r--r--contributors/guide/style-guide.md2
-rw-r--r--sig-contributor-experience/markdown-link-style-guide.md27
2 files changed, 3 insertions, 26 deletions
diff --git a/contributors/guide/style-guide.md b/contributors/guide/style-guide.md
index 3b81ef5b..0444c5ba 100644
--- a/contributors/guide/style-guide.md
+++ b/contributors/guide/style-guide.md
@@ -410,7 +410,7 @@ external appearance.
```markdown
This file has moved to https://git.k8s.io/community/contributors/guide/README.md.
- This file is a placeholder to preserve links. Please remove after 2019-03-10 or the release of kubernetes 1.10, whichever comes first.
+ This file is a placeholder to preserve links. Please remove after 2019-03-10 or the release of Kubernetes 1.10, whichever comes first.
```
diff --git a/sig-contributor-experience/markdown-link-style-guide.md b/sig-contributor-experience/markdown-link-style-guide.md
index 2c0ef4d2..f766b249 100644
--- a/sig-contributor-experience/markdown-link-style-guide.md
+++ b/sig-contributor-experience/markdown-link-style-guide.md
@@ -1,26 +1,3 @@
-# Markdown Link Style Guide
+This file has moved to https://git.k8s.io/community/contributors/guide/style-guide.md.
-Markdown provides for a number of different ways to link between documents. There are advantages and disadvantages of each method.
-
-- If you are linking between documents in the same folder, the easiest way to do it is use a relative link.
-```
-See this other document [here](document-2.md).
-```
-
-- If you are linking to a file in the same repo, but not in the same directory, it's usually best to use an absolute link from the root of the repo. The reason for this is if the source document moves, the destination document will still have the correct link. It also allows your links to work properly in your own fork of the repo.
-```
-For more information, check out [this](/contributor/guide/document-3.md) document.
-```
-
-- If you are linking to a file in another kubernetes repo, then use of the git.k8s.io shortener is preferred over a direct github link. This shortener lives in the kubernetes/k8s.io repo.
-```
-The super cool [prow tool](https://git.k8s.io/test-infra/prow/README.md) resides in the test-infra repo under the kubernetes organization
-```
-
-- If you are moving a document and leaving a tombstone file in it's place, please also set an end date for when the tombstone can be removed.
-```
-This file has moved to https://git.k8s.io/community/contributors/guide/README.md.
-<!--
-This file is a placeholder to preserve links. Please remove after 3 months or the release of kubernetes 1.10, whichever comes first.
--->
-```
+This file is a placeholder to preserve links. Please remove after 2020-03-30 or the release of Kubernetes 1.18, whichever comes first.