Merge branch 'pub/SYCL-2020/master' into ronan/SYCL-2020/modernize-CI

.github/workflows/CI.yml

@@ -124,6 +124,10 @@ jobs:
         if: github.event_name == 'workflow_dispatch'
                 && inputs.launch_tmate_terminal_for_debug
 
+      - name: Verify reflow conformance
+        run: |
+          ./adoc/scripts/verify_reflow_conformance.sh
+
       - name: Archive generated files
         uses: actions/upload-artifact@v4
         with:

COPYRIGHT.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 The Khronos Group, Inc.
+Copyright (c) 2011-2024 The Khronos Group, Inc.
 
 This specification is protected by copyright laws and contains material proprietary
 to Khronos. Except as described by these terms, it or any components

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 The Khronos Group, Inc.
+Copyright (c) 2011-2024 The Khronos Group, Inc.
 
 The files in, and generated output documents from this SYCL-Docs project are
 under a mix of copyright and license statements. Refer to the individual files

README.md

@@ -2,8 +2,8 @@
 
 <!-- to update to newer CI when going public ![Build Status](https://api.travis-ci.com/KhronosGroup/SYCL-Docs.svg?branch=master) -->
 <!-- to update to newer CI when going public [![SPEC master](https://img.shields.io/badge/SPEC-master-red.svg?logo=adobe-acrobat-reader)](https://khronosgroup.github.io/SYCL-Docs/sycl/sycl.pdf) -->
-[![SPEC 2020-7](https://img.shields.io/badge/SPEC-2020--7-orange.svg?logo=adobe-acrobat-reader)](https://www.khronos.org/registry/SYCL/specs/sycl-2020/pdf/sycl-2020.pdf)
-[![SPEC 2020-7](https://img.shields.io/badge/SPEC-2020--7-orange.svg?logo=HTML5)](https://www.khronos.org/registry/SYCL/specs/sycl-2020/html/sycl-2020.html)
+[![SPEC 2020-8](https://img.shields.io/badge/SPEC-2020--8-orange.svg?logo=adobe-acrobat-reader)](https://www.khronos.org/registry/SYCL/specs/sycl-2020/pdf/sycl-2020.pdf)
+[![SPEC 2020-8](https://img.shields.io/badge/SPEC-2020--8-orange.svg?logo=HTML5)](https://www.khronos.org/registry/SYCL/specs/sycl-2020/html/sycl-2020.html)
 [![SPEC latest](https://img.shields.io/badge/SPEC-latest-red.svg?logo=adobe-acrobat-reader)](https://github.com/KhronosGroup/SYCL-Docs/actions?query=branch%3ASYCL-2020%2Fmaster+is%3Asuccess)
 [![Join the Slack group](https://img.shields.io/badge/chat-on%20slack-blue.svg?logo=slack)](https://khr.io/slack)
 
@@ -113,7 +113,7 @@ environment. However, if you are using Debian/Ubuntu Linux, either native or
 via WSL2, you should be able to install the required tools by looking at the
 Dockerfile at
 
-https://github.com/KhronosGroup/DockerContainers/blob/master/asciidoctor-spec.dockerfile
+https://github.com/KhronosGroup/DockerContainers/blob/master/asciidoctor-spec.Dockerfile
 
 Note that the Khronos Docker image layers on the official Ruby 3.1 Docker
 image, so you must install Ruby first.

adoc/Makefile

@@ -1,4 +1,4 @@
-# Copyright 2011-2022 The Khronos Group, Inc.
+# Copyright 2011-2024 The Khronos Group, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -136,7 +136,7 @@ ATTRIBOPTS   = --attribute revdate="$(SPECDATE)" \
   --attribute generated=$(GENERATED) \
   --attribute refprefix \
   $(VERSIONATTRIBS)
-ADOCMISCOPTS = --require asciidoctor-diagram --failure-level ERROR
+ADOCMISCOPTS = --require asciidoctor-diagram --failure-level INFO
 ADOCEXTS     = --require $(CURDIR)/config/spec-macros.rb \
 	--require $(CURDIR)/config/rouge_sycl.rb
 ADOCOPTS     = --doctype book $(ADOCMISCOPTS) $(ATTRIBOPTS) \

adoc/chapters/acknowledgements.adoc

@@ -5,7 +5,8 @@
 
   * Maria Rovatsou, Codeplay
   * Lee Howes, Qualcomm
-  * Ronan Keryell, AMD (current)
+  * Ronan Keryell, AMD
+  * Greg Lueck, Intel (current)
 
 *Contributors*
 
@@ -30,6 +31,8 @@
   * Verena Beckham, Codeplay
   * Aidan Belton, Codeplay
   * Gordon Brown, Codeplay
+  * Hugh Delaney, Codeplay
+  * Atharva Dubey, Codeplay
   * Morris Hafner, Codeplay
   * Alexander Johnston, Codeplay
   * Marios Katsigiannis, Codeplay
@@ -40,6 +43,7 @@
   * Duncan McBain, Codeplay
   * Nicolas Miller, Codeplay
   * Georgi Mirazchiyski, Codeplay
+  * Mahmoud Moadeli, Codeplay
   * Ralph Potter, Codeplay
   * Ruyman Reyes, Codeplay
   * Andrew Richards, Codeplay
@@ -67,7 +71,7 @@
   * Jon Leech, Luna Princeps LLC
   * Kathleen Mattson, Miller & Mattson, LLC
   * Dave Miller, Miller & Mattson, LLC
-  * Stéphanie Even,  Mercedes-Benz Research and Development NA
+  * Stéphanie Even, Mercedes-Benz Research and Development NA
   * Chris Gearing, Mobileye
   * Seiji Nishimura, NSITEXE, Inc.
   * Neil Trevett, NVIDIA
@@ -80,6 +84,7 @@
   * Hyesun Hong, Samsung Electronics
   * Aksel Alpay, Self
   * Dániel Berényi, Self
+  * Nuno Nobre, STFC Hartree Centre
   * Máté Nagy-Egri, Stream HPC
   * Bálint Soproni, Stream HPC
   * Tom Deakin, University of Bristol