Skip to content

Commit ff2c131

Browse files
authored
Document change from default master to main branch (#766)
* Document change from default `master` to `main` branch Merge after using Github's renaming tool. * Empty commit to force a new Github Actions invocation - seem to be some configuration issues that may be the reason the previous commit failed.
1 parent b7fe6ef commit ff2c131

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

README.adoc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ The most useful parts of this document are the <<intro, Introduction>>,
1010
Dependencies>>.
1111
====
1212

13+
[NOTE]
14+
.Note
15+
====
16+
The default branch of this repository has changed from `master` to `main`.
17+
====
18+
1319
[[intro]]
1420
== Introduction
1521

@@ -37,7 +43,7 @@ You'll be prompted with a one-time "`click-through`" Contributor's License
3743
Agreement (CLA) dialog as part of submitting your pull request or other
3844
contribution to GitHub.
3945

40-
We intend to maintain a linear history on the GitHub `master` branch.
46+
We intend to maintain a linear history on the GitHub `main` branch.
4147

4248

4349
[[repo]]
@@ -142,7 +148,7 @@ take several minutes.
142148
Most of the reference pages are extracted from the OpenCL API and OpenCL
143149
C Specifications, although some are static.
144150
While anyone can generate reference page sets for themselves, Khronos
145-
publishes them via the `master` branch of the
151+
publishes them via the `main` branch of the
146152
https://www.khronos.org/registry/OpenCL/sdk/2.2/docs/man/[OpenCL Registry].
147153

148154
When the OpenCL Specification Editor is updating the published reference

api/footnotes.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2017-2021 The Khronos Group. This work is licensed under a
1+
// Copyright 2017-2022 The Khronos Group. This work is licensed under a
22
// Creative Commons Attribution 4.0 International License; see
33
// http://creativecommons.org/licenses/by/4.0/
44

@@ -162,7 +162,7 @@ If there is no valid PCI vendor ID defined for the physical device, implementati
162162
This is a unique identifier greater than the largest PCI vendor ID (`0x10000`) and is representable by a {cl_uint_TYPE}. \
163163
Khronos vendor IDs are synchronized across APIs by utilizing Vulkan's vk.xml as the central Khronos vendor ID registry. \
164164
An ID must be reserved here prior to use in OpenCL, regardless of whether a vendor implements Vulkan. \
165-
Only once the ID has been allotted may it be exposed to OpenCL by proposing a merge request against cl.xml, in the master branch of the OpenCL-Docs project. \
165+
Only once the ID has been allotted may it be exposed to OpenCL by proposing a merge request against cl.xml, in the `main` branch of the OpenCL-Docs project. \
166166
The merge must define a new enumerant by adding an `<enum>` tag to the {cl_khronos_vendor_id_TYPE} `<enums>` tag, with the `<value>` attribute set as the acquired Khronos vendor ID. \
167167
The `<name>` attribute must identify the vendor/adopter, and be of the form `CL_KHRONOS_VENDOR_ID_<vendor>`. \
168168
]

extensions/cl_extension_template.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018-2021 The Khronos Group. This work is licensed under a
1+
// Copyright 2018-2022 The Khronos Group. This work is licensed under a
22
// Creative Commons Attribution 4.0 International License; see
33
// http://creativecommons.org/licenses/by/4.0/
44

@@ -223,7 +223,7 @@ CL_ANOTHER_ENUM_KHR 0xYYYY
223223
The 'New API Enums' section should list any new enumerants added by
224224
this extension along with the value of the new enumerant. Until
225225
values are assigned by the Khronos Registry from the
226-
https://github.com/KhronosGroup/OpenCL-Docs/blob/master/xml/cl.xml[enumerant
226+
https://github.com/KhronosGroup/OpenCL-Docs/blob/main/xml/cl.xml[enumerant
227227
registry], use a placeholder value, e.g. `0x????`.
228228
229229
Typically, new enumerants have a short description indicating which

man/static/intro.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2007-2021 The Khronos Group Inc.
1+
// Copyright 2007-2022 The Khronos Group Inc.
22
// SPDX-License-Identifier: CC-BY-4.0
33

44
:data-uri:
@@ -43,7 +43,7 @@ core specification in later revisions of the OpenCL specification.
4343
== Reference Page Sources
4444

4545
Khronos publishes the OpenCL 3.0 reference pages in the
46-
https://www.github.com/KhronosGroup/OpenCL-Registry/tree/master/sdk/3.0/docs/[OpenCL-Registry
46+
https://www.github.com/KhronosGroup/OpenCL-Registry/tree/main/sdk/3.0/docs/[OpenCL-Registry
4747
repository].
4848
The sources for these pages are in Asciidoctor format, and are maintained in
4949
the https://www.github.com/KhronosGroup/OpenCL-Docs[OpenCL-Docs repository].

scripts/gen_dictionaries.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python3
22

3-
# Copyright 2019-2021 The Khronos Group Inc.
3+
# Copyright 2019-2022 The Khronos Group Inc.
44
# SPDX-License-Identifier: Apache-2.0
55

66
from collections import OrderedDict
@@ -47,7 +47,7 @@ def GetFooter():
4747
typeFileName = args.directory + '/api-types.txt'
4848

4949
specpath = args.registry
50-
#specpath = "https://raw.githubusercontent.com/KhronosGroup/OpenCL-Registry/master/xml/cl.xml"
50+
#specpath = "https://raw.githubusercontent.com/KhronosGroup/OpenCL-Registry/main/xml/cl.xml"
5151

5252
print('Generating dictionaries from: ' + specpath)
5353

xml/cl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<registry>
33
<comment>
4-
Copyright (c) 2013-2021 The Khronos Group Inc.
4+
Copyright 2013-2022 The Khronos Group Inc.
55

66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -39,8 +39,8 @@ machine-readable definition of the API, parameter and member validation
3939
language incorporated into the Specification and reference pages, and other
4040
material which is registered by Khronos.
4141

42-
The authoritative public version of cl.xml is maintained in the master
43-
branch of the Khronos OpenCL-API GitHub repository. The authoritative
42+
The authoritative public version of cl.xml is maintained in the `main`
43+
branch of the Khronos OpenCL-Docs GitHub repository. The authoritative
4444
private version is maintained in the master branch of the member gitlab
4545
server's OpenCL/api-docs repository.
4646
</comment>

0 commit comments

Comments
 (0)