From 66dfacc25812d2095e112f47b8ec191df0dff6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Thu, 27 Mar 2025 13:51:29 +0100 Subject: [PATCH] Remove -S changelog templates from open-source edition These changelogs meant for -S edition were introduced to avoid rebase conflicts. However, the same result can be achieved by linking the -S changelogs directly from their open-source variants, rather than including the -S changelogs directly in changelog.rst. --- doc/arm/changelog.rst | 7 ------- doc/changelog/changelog-9.18.29-S1.rst | 11 ----------- doc/changelog/changelog-9.18.30-S1.rst | 11 ----------- doc/changelog/changelog-9.18.31-S1.rst | 11 ----------- doc/changelog/changelog-9.18.32-S1.rst | 11 ----------- doc/changelog/changelog-9.18.33-S1.rst | 11 ----------- doc/changelog/changelog-9.18.34-S1.rst | 11 ----------- doc/changelog/changelog-9.18.35-S1.rst | 11 ----------- 8 files changed, 84 deletions(-) delete mode 100644 doc/changelog/changelog-9.18.29-S1.rst delete mode 100644 doc/changelog/changelog-9.18.30-S1.rst delete mode 100644 doc/changelog/changelog-9.18.31-S1.rst delete mode 100644 doc/changelog/changelog-9.18.32-S1.rst delete mode 100644 doc/changelog/changelog-9.18.33-S1.rst delete mode 100644 doc/changelog/changelog-9.18.34-S1.rst delete mode 100644 doc/changelog/changelog-9.18.35-S1.rst diff --git a/doc/arm/changelog.rst b/doc/arm/changelog.rst index 32c151f854..686c59224c 100644 --- a/doc/arm/changelog.rst +++ b/doc/arm/changelog.rst @@ -18,18 +18,11 @@ Changelog development. Regular users should refer to :ref:`Release Notes ` for changes relevant to them. -.. include:: ../changelog/changelog-9.18.35-S1.rst .. include:: ../changelog/changelog-9.18.35.rst -.. include:: ../changelog/changelog-9.18.34-S1.rst .. include:: ../changelog/changelog-9.18.34.rst -.. include:: ../changelog/changelog-9.18.33-S1.rst .. include:: ../changelog/changelog-9.18.33.rst -.. include:: ../changelog/changelog-9.18.32-S1.rst .. include:: ../changelog/changelog-9.18.32.rst -.. include:: ../changelog/changelog-9.18.31-S1.rst .. include:: ../changelog/changelog-9.18.31.rst -.. include:: ../changelog/changelog-9.18.30-S1.rst .. include:: ../changelog/changelog-9.18.30.rst -.. include:: ../changelog/changelog-9.18.29-S1.rst .. include:: ../changelog/changelog-9.18.29.rst .. include:: ../changelog/changelog-history.rst diff --git a/doc/changelog/changelog-9.18.29-S1.rst b/doc/changelog/changelog-9.18.29-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.29-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.30-S1.rst b/doc/changelog/changelog-9.18.30-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.30-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.31-S1.rst b/doc/changelog/changelog-9.18.31-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.31-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.32-S1.rst b/doc/changelog/changelog-9.18.32-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.32-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.33-S1.rst b/doc/changelog/changelog-9.18.33-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.33-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.34-S1.rst b/doc/changelog/changelog-9.18.34-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.34-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. - diff --git a/doc/changelog/changelog-9.18.35-S1.rst b/doc/changelog/changelog-9.18.35-S1.rst deleted file mode 100644 index ba871808a1..0000000000 --- a/doc/changelog/changelog-9.18.35-S1.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. Copyright (C) Internet Systems Consortium, Inc. ("ISC") -.. -.. SPDX-License-Identifier: MPL-2.0 -.. -.. This Source Code Form is subject to the terms of the Mozilla Public -.. License, v. 2.0. If a copy of the MPL was not distributed with this -.. file, you can obtain one at https://mozilla.org/MPL/2.0/. -.. -.. See the COPYRIGHT file distributed with this work for additional -.. information regarding copyright ownership. -