From 06585f8a664c9eb05444531779f390b1eb64af2a Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 5 Feb 2020 11:46:37 +1100 Subject: [PATCH 1/3] DCD-914: Remove scary support message and link to SAC. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 45918c6..7a1a1d8 100644 --- a/README.md +++ b/README.md @@ -408,17 +408,17 @@ in the running container: # Support -These Confluence Docker images are presented as a technical preview, and not -recommended for critical production deployments. However if you are interested -in deploying with containers we would be interested in hearing your feedback. +For product support, go to +[support.atlassian.com](https://support.atlassian.com/). -Note that these images are built on the [AdoptOpenJDK][11] images. Prior to -Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13 -release-notes][12] for more information. +Note that these images are built on the +[AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to Confluence 6.13 +OpenJDK was not a supported platform. See [the 6.13 release-notes][12] for more +information. # License -Copyright © 2019 Atlassian Corporation Pty Ltd. +Copyright © 2020 Atlassian Corporation Pty Ltd. Licensed under the Apache License, Version 2.0. [1]: https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume From 42e82e5f831d560e6575c3c1a931f395f48e9015 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 5 Feb 2020 14:32:28 +1100 Subject: [PATCH 2/3] DCD-914: Clean up unused link. --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7a1a1d8..299f2a8 100644 --- a/README.md +++ b/README.md @@ -411,10 +411,9 @@ in the running container: For product support, go to [support.atlassian.com](https://support.atlassian.com/). -Note that these images are built on the -[AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to Confluence 6.13 -OpenJDK was not a supported platform. See [the 6.13 release-notes][12] for more -information. +Note that these images are built on the [AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to +Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13 +release-notes][12] for more information. # License @@ -430,5 +429,4 @@ Licensed under the Apache License, Version 2.0. [8]: https://confluence.atlassian.com/display/DOC/Configuring+Backups [9]: https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy [10]: https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore -[11]: https://adoptopenjdk.net/ [12]: https://confluence.atlassian.com/doc/confluence-6-13-release-notes-959288785.html From ef88b87cc560ca44b00fbb4a74e69c01a7aba64c Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Thu, 6 Feb 2020 12:58:22 +1100 Subject: [PATCH 3/3] DCD-914: Use confluence support link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 299f2a8..2f2548d 100644 --- a/README.md +++ b/README.md @@ -409,7 +409,7 @@ in the running container: # Support For product support, go to -[support.atlassian.com](https://support.atlassian.com/). +[support.atlassian.com](https://support.atlassian.com/confluence-server/). Note that these images are built on the [AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13