Updates for 18 release
diff --git a/netbeans.apache.org/src/content/download/archive/index.adoc b/netbeans.apache.org/src/content/download/archive/index.adoc
index 6b50dcc..d1639b3 100644
--- a/netbeans.apache.org/src/content/download/archive/index.adoc
+++ b/netbeans.apache.org/src/content/download/archive/index.adoc
@@ -28,6 +28,12 @@
Older Apache NetBeans releases can still be downloaded, but are no longer supported.
+== Apache NetBeans 17
+
+Apache NetBeans 17 was released on February 21, 2023.
+
+link:https://github.com/apache/netbeans/releases/tag/17[Features, role="button"] xref:../nb16/index.adoc[Download, role="button success"]
+
== Apache NetBeans 16
Apache NetBeans 16 was released on November 30, 2022.
diff --git a/netbeans.apache.org/src/content/download/index.adoc b/netbeans.apache.org/src/content/download/index.adoc
index e5553e4..516557e 100644
--- a/netbeans.apache.org/src/content/download/index.adoc
+++ b/netbeans.apache.org/src/content/download/index.adoc
@@ -37,11 +37,11 @@
Apache NetBeans is released four times a year. For details, see link:https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule[full release schedule].
-== Apache NetBeans 17
+== Apache NetBeans 18
-Latest version of the IDE, released on February 21, 2023.
+Latest version of the IDE, released on May 30, 2023.
-xref:nb17/index.adoc[Download, role="button success"]
+xref:nb18/index.adoc[Download, role="button success"]
== Older releases
diff --git a/netbeans.apache.org/src/content/download/nb18/index.adoc b/netbeans.apache.org/src/content/download/nb18/index.adoc
new file mode 100644
index 0000000..6fb7bf1
--- /dev/null
+++ b/netbeans.apache.org/src/content/download/nb18/index.adoc
@@ -0,0 +1,137 @@
+////
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+////
+////
+
+NOTE:
+See https://www.apache.org/dev/release-download-pages.html
+for important requirements for download pages for Apache projects.
+
+////
+= Downloading Apache NetBeans 18
+:jbake-type: page_noaside
+:jbake-tags: download
+:jbake-status: published
+:keywords: Apache NetBeans 18 Download
+:description: Apache NetBeans 18 Download
+:toc: left
+:toc-title:
+:icons: font
+
+// check version above
+:netbeans-version: 18
+
+// base URLs - when archiving, delete the next 2 lines and uncomment the following 2
+:url-download: https://www.apache.org/dyn/closer.cgi/netbeans/
+:url-download-keychecksum: https://downloads.apache.org/netbeans/
+// :url-download: https://archive.apache.org/dist/netbeans/
+// :url-download-keychecksum: https://archive.apache.org/dist/netbeans/
+
+////
+url-download depends of release status archived or not
+https://archive.apache.org/dist/netbeans/ (//archived)
+https://www.apache.org/dyn/closer.cgi/netbeans/ (//current)
+
+url-download-keychecksum depends of release status archived or not
+https://archive.apache.org/dist/netbeans/ (//archived)
+https://downloads.apache.org/netbeans/ (//current)
+////
+
+Apache NetBeans {netbeans-version} was released on May 30, 2023.
+////
+NOTE: It's mandatory to link to the source. It's optional to link to the binaries.
+NOTE: It's mandatory to link against https://www.apache.org for the sums & keys. https is recommended.
+NOTE: It's NOT recommended to link to github.
+////
+Apache NetBeans {netbeans-version} is available for download from your closest Apache mirror.
+
+*Binaries (Platform Independent):*
+
+* link:{url-download}netbeans/{netbeans-version}/netbeans-{netbeans-version}-bin.zip[netbeans-{netbeans-version}-bin.zip] (link:{url-download-keychecksum}netbeans/{netbeans-version}/netbeans-{netbeans-version}-bin.zip.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans/{netbeans-version}/netbeans-{netbeans-version}-bin.zip.asc[PGP ASC])
+
+*Installers and Packages:*
+
+* link:{url-download}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe[Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe] (link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe.asc[PGP ASC])
+* link:{url-download}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-macosx.dmg[Apache-NetBeans-{netbeans-version}-bin-macosx.dmg] (link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-macosx.dmg.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-macosx.dmg.asc[PGP ASC])
+* link:{url-download}netbeans-installers/{netbeans-version}/apache-netbeans_{netbeans-version}-1_all.deb[apache-netbeans_{netbeans-version}-1_all.deb] (link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/apache-netbeans_{netbeans-version}-1_all.deb.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/apache-netbeans_{netbeans-version}-1_all.deb.asc[PGP ASC])
+* link:{url-download}netbeans-installers/{netbeans-version}/apache-netbeans-{netbeans-version}-0.noarch.rpm[apache-netbeans-{netbeans-version}-0.noarch.rpm] (link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/apache-netbeans-{netbeans-version}-0.noarch.rpm.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/apache-netbeans-{netbeans-version}-0.noarch.rpm.asc[PGP ASC])
+* link:https://snapcraft.io/netbeans[Linux snap package]
+
+*Source:*
+
+* link:{url-download}netbeans/{netbeans-version}/netbeans-{netbeans-version}-source.zip[netbeans-{netbeans-version}-source.zip] (link:{url-download-keychecksum}netbeans/{netbeans-version}/netbeans-{netbeans-version}-source.zip.sha512[SHA-512],
+link:{url-download-keychecksum}netbeans/{netbeans-version}/netbeans-{netbeans-version}-source.zip.asc[PGP ASC])
+
+Officially, it is important that you link:https://www.apache.org/dyn/closer.cgi#verify[verify the integrity]
+of the downloaded files using the PGP signatures (.asc file) or a hash (.sha512 files).
+The PGP keys used to sign this release are available link:https://downloads.apache.org/netbeans/KEYS[here].
+
+*Release Notes:*
+
+* link:https://github.com/apache/netbeans/releases/tag/{netbeans-version}[Github Link]
+
+== Community Installers
+
+- link:https://www.codelerity.com/netbeans/[Codelerity / Gj IT packages] - Windows, macOS and
+Linux (.deb / .rpm / .AppImage) built with
+link:https://github.com/apache/netbeans-nbpackage/[NBPackage]. Most
+include a local JDK runtime for the IDE to run on, for a self-contained out-of-the-box
+experience.
+
+
+IMPORTANT: Individual NetBeans committers may provide additional binary packages as a convenience.
+While built using the Apache NetBeans release, they are not releases of the Apache Software
+Foundation. They may include other contents (eg. JDK) under additional license terms.
+
+== Deployment Platforms
+
+The Apache NetBeans {netbeans-version} binary releases require JDK 11+, and officially support running on JDK 11, 17 and 20.
+
+TIP: The Runtime JDK NetBeans uses does not influence the JDK range projects can use.
+
+== Known Issues
+
+* link:https://github.com/apache/netbeans/issues[All Issues on GitHub]
+
+* link:https://netbeans.apache.org/participate/report-issue.html[How to Report an Issue]
+
+== Building from Source
+
+1. Unzip link:{url-download}netbeans/{netbeans-version}/netbeans-{netbeans-version}-source.zip[netbeans-{netbeans-version}-source.zip]
+in a directory of your liking.
+
+[start=2]
+. Follow the build instructions in the README
+
+== Community Approval
+
+As in any other Apache Project, the Apache NetBeans Community approved this release
+through the following voting processes in our xref:../../community/mailing-lists.adoc[mailing lists]:
+
+- link:https://lists.apache.org/thread/g4nz2qyl8xn9zj8y1sj2l8hvd2020dv2[PMC vote]
+- link:https://lists.apache.org/thread/n348mn3j4g5y733cgocwjcbnc6hk3q5c[PMC vote result]
+
+== Earlier Releases
+
+Please visit the xref:../index.adoc[Apache NetBeans Download page] for further details.
+
