diff --git a/README.adoc b/README.adoc
index ef9042ed..c5f8c4d1 100644
--- a/README.adoc
+++ b/README.adoc
@@ -18,13 +18,13 @@ extension specifications, and problems with the content of the registry
OpenCL enumerants are now documented in the specification repository
https://github.com/KhronosGroup/OpenCL-Docs in the file
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/xml/cl.xml
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/xml/cl.xml
-New enumerant ranges can be allocated by proposing a pull request to master
+New enumerant ranges can be allocated by proposing a pull request to `main`
branch of OpenCL-Docs modifying `cl.xml`, following the
existing examples. Allocate ranges starting at the lowest free values
available (search for "`Reserved for vendor extensions`"). Ranges are not
-officially allocated until your pull request is *accepted* into master
+officially allocated until your pull request is *accepted* into `main`
branch of the OpenCL-Docs repository. At that point you can use values from
your assigned range for API extensions.
diff --git a/extensions/img/cl_img_cached_allocations.txt b/extensions/img/cl_img_cached_allocations.txt
index d435a0f4..25395481 100644
--- a/extensions/img/cl_img_cached_allocations.txt
+++ b/extensions/img/cl_img_cached_allocations.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/img/cl_img_cached_allocations
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_img_cached_allocations.asciidoc
\ No newline at end of file
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_img_cached_allocations.asciidoc
diff --git a/extensions/img/cl_img_use_gralloc_ptr.txt b/extensions/img/cl_img_use_gralloc_ptr.txt
index 87f3c874..7372b659 100644
--- a/extensions/img/cl_img_use_gralloc_ptr.txt
+++ b/extensions/img/cl_img_use_gralloc_ptr.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/img/cl_img_use_gralloc_ptr.ht
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_img_use_gralloc_ptr.asciidoc
\ No newline at end of file
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_img_use_gralloc_ptr.asciidoc
diff --git a/extensions/img/cl_img_yuv_image.txt b/extensions/img/cl_img_yuv_image.txt
index 62edad35..a17885ed 100644
--- a/extensions/img/cl_img_yuv_image.txt
+++ b/extensions/img/cl_img_yuv_image.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/img/cl_img_yuv_image.html
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_img_yuv_image.asciidoc
\ No newline at end of file
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_img_yuv_image.asciidoc
diff --git a/extensions/intel/cl_intel_packed_yuv.txt b/extensions/intel/cl_intel_packed_yuv.txt
index 690683d6..d911f635 100644
--- a/extensions/intel/cl_intel_packed_yuv.txt
+++ b/extensions/intel/cl_intel_packed_yuv.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/intel/cl_intel_packed_yuv.htm
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_intel_packed_yuv.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_intel_packed_yuv.asciidoc
diff --git a/extensions/intel/cl_intel_planar_yuv.txt b/extensions/intel/cl_intel_planar_yuv.txt
index 636dbea9..3751c847 100644
--- a/extensions/intel/cl_intel_planar_yuv.txt
+++ b/extensions/intel/cl_intel_planar_yuv.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/intel/cl_intel_planar_yuv.htm
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_intel_planar_yuv.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_intel_planar_yuv.asciidoc
diff --git a/extensions/intel/cl_intel_required_subgroup_size.txt b/extensions/intel/cl_intel_required_subgroup_size.txt
index 6736a718..30e8a761 100644
--- a/extensions/intel/cl_intel_required_subgroup_size.txt
+++ b/extensions/intel/cl_intel_required_subgroup_size.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/intel/cl_intel_required_subgr
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_intel_required_subgroup_size.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_intel_required_subgroup_size.asciidoc
diff --git a/extensions/intel/cl_intel_subgroups.txt b/extensions/intel/cl_intel_subgroups.txt
index 710e0e9d..aab87828 100644
--- a/extensions/intel/cl_intel_subgroups.txt
+++ b/extensions/intel/cl_intel_subgroups.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/intel/cl_intel_subgroups.html
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_intel_subgroups.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_intel_subgroups.asciidoc
diff --git a/extensions/intel/cl_intel_subgroups_short.txt b/extensions/intel/cl_intel_subgroups_short.txt
index 74f225cd..3272e30d 100644
--- a/extensions/intel/cl_intel_subgroups_short.txt
+++ b/extensions/intel/cl_intel_subgroups_short.txt
@@ -8,4 +8,4 @@ https://www.khronos.org/registry/OpenCL/extensions/intel/cl_intel_subgroups_shor
The asciidoc source for this extension specification may
be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/extensions/cl_intel_subgroups_short.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/extensions/cl_intel_subgroups_short.asciidoc
diff --git a/extensions/khr/cl_khr_d3d10_sharing.txt b/extensions/khr/cl_khr_d3d10_sharing.txt
index cb4876ed..d979ac90 100644
--- a/extensions/khr/cl_khr_d3d10_sharing.txt
+++ b/extensions/khr/cl_khr_d3d10_sharing.txt
@@ -9,4 +9,4 @@ https://www.khronos.org/registry/OpenCL/
The Asciidoc source for this extension may be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_d3d10_sharing.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/ext/cl_khr_d3d10_sharing.asciidoc
diff --git a/extensions/khr/cl_khr_gl_sharing.txt b/extensions/khr/cl_khr_gl_sharing.txt
index 8b85e32d..bd1779cd 100644
--- a/extensions/khr/cl_khr_gl_sharing.txt
+++ b/extensions/khr/cl_khr_gl_sharing.txt
@@ -9,6 +9,6 @@ https://www.khronos.org/registry/OpenCL/
The Asciidoc source for this extension may be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_gl_sharing__context.asciidoc
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_gl_sharing__memobjs.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/ext/cl_khr_gl_sharing__context.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/ext/cl_khr_gl_sharing__memobjs.asciidoc
diff --git a/extensions/khr/cl_khr_icd.txt b/extensions/khr/cl_khr_icd.txt
index 17b34885..97084934 100644
--- a/extensions/khr/cl_khr_icd.txt
+++ b/extensions/khr/cl_khr_icd.txt
@@ -9,4 +9,4 @@ https://www.khronos.org/registry/OpenCL/
The Asciidoc source for this extension may be found here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_icd.asciidoc
+https://github.com/KhronosGroup/OpenCL-Docs/blob/main/ext/cl_khr_icd.asciidoc
diff --git a/index.php b/index.php
index cca0ab7c..d0723405 100644
--- a/index.php
+++ b/index.php
@@ -242,7 +242,7 @@
Enumerant and Extension Number Registry
-
+
cl.xml is the registry of reserved OpenCL API enumerant ranges.
(Note that following this link will probably not render sensibly in
browsers, since the file is not entirely valid XML, simply a manually