Merge branch 'expiry' into 'master'

Clarify artifact expiry ## What does this MR do? Clarifies documentation about artifact expiry. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4831

Merge branch 'expiry' into 'master'
7e42d499 · Achilleas Pipinellis · 564026f6 · 4693b748 · 7e42d499
Commit 7e42d499 authored Jun 22, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

README.md doc/ci/yaml/README.md +2 -2

No files found.
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -726,8 +726,8 @@ time they are uploaded and stored on GitLab.
 You can use the **Keep** button on the build page to override expiration and
 keep artifacts forever.

-By default, artifacts are deleted hourly (via a cron job), but they are not
-accessible after expiry.
+After expiry, artifacts are actually deleted hourly by default (via a cron job),
+but they are not accessible after expiry.

 The value of `expire_in` is an elapsed time. Examples of parseable values:
 - '3 mins 4 sec'