Fix test cases in proposals-disallowed and two typos in an updated proposal.

Add $(QUIET) before most check-* build targets to cut down on noise in CI logs.

Author: oddhack

Makefile

@@ -472,7 +472,7 @@ MARKUP_SPEC_SOURCES = $(SPECDIR)/[a-z]*.adoc $(SPECDIR)/chapters $(SPECDIR)/appe
 # Look for disallowed contractions
 CHECK_CONTRACTIONS = git grep -n -i -F -f $(ROOTDIR)/config/CI/contractions | grep -v -E -f $(ROOTDIR)/config/CI/contractions-allowed
 check-contractions:
-	if test `$(CHECK_CONTRACTIONS) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_CONTRACTIONS) | wc -l` != 0 ; then \
 	    echo "Contractions found that are not allowed:" ; \
 	    $(CHECK_CONTRACTIONS) ; \
 	    exit 1 ; \
@@ -481,8 +481,9 @@ check-contractions:
 # Look for duplicate words
 CHECK_DUPLICATES = $(PYTHON) $(ROOTDIR)/scripts/find_duplicates.py `find *.adoc appendices chapters config scripts style -name '*.adoc'`
 check-duplicates:
-	if ! $(CHECK_DUPLICATES) ; then \
+	$(QUIET) if ! $(CHECK_DUPLICATES) ; then \
 	    echo "Successive duplicate words found that are not allowed" ; \
+	    $(CHECK_DUPLICATES) ; \
 	    exit 1 ; \
 	fi
 
@@ -491,7 +492,7 @@ check-duplicates:
 # check-writing target below.
 CODESPELL = codespell --config $(ROOTDIR)/config/CI/codespellrc
 check-spelling:
-	if ! $(CODESPELL) > /dev/null ; then \
+	$(QUIET) if ! $(CODESPELL) > /dev/null ; then \
 	    echo "Found probable misspellings. Corrections can be added to config/CI/codespell-allowed, or files excluded in config/CI/codespellrc if there is no other option:" ; \
 	    $(CODESPELL) ; \
 	    exit 1 ; \
@@ -502,7 +503,7 @@ check-spelling:
 # made in outstanding extension branches for new text.
 CHECK_WRITING = git grep -n -E -f $(ROOTDIR)/config/CI/writing $(SPECDIR)/[a-z]*.adoc $(SPECDIR)/chapters $(SPECDIR)/appendices
 check-writing:
-	if test `$(CHECK_WRITING) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_WRITING) | wc -l` != 0 ; then \
 	    echo "Found old style writing. Please refer to the style guide or similar language in current main branch for fixes:" ; \
 	    $(CHECK_WRITING) ; \
 	    exit 1 ; \
@@ -511,7 +512,7 @@ check-writing:
 # Look for bullet list items not preceded by exactly two spaces, per styleguide
 CHECK_BULLETS = git grep -n -E '^( |   +)[-*]+ ' $(MARKUP_SPEC_SOURCES)
 check-bullets:
-	if test `$(CHECK_BULLETS) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_BULLETS) | wc -l` != 0 ; then \
 	    echo "Bullet list item found not preceded by exactly two spaces:" ; \
 	    $(CHECK_BULLETS) ; \
 	    exit 1 ; \
@@ -520,7 +521,7 @@ check-bullets:
 # Look for VU text ending in a period
 CHECK_VUPERIOD = ag --nocolor --asciidoc '\* \[\[VUID[^.]+\.\n( {2}\* \[\[VUID|\*\*\*\*)' $(MARKUP_SPEC_SOURCES)
 check-vuperiod:
-	if test `$(CHECK_VUPERIOD) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_VUPERIOD) | wc -l` != 0 ; then \
 	    echo "VU rule ending with a disallowed period found. Note that the matched text may be very long:" ; \
 	    $(CHECK_VUPERIOD) ; \
 	    exit 1 ; \
@@ -529,7 +530,7 @@ check-vuperiod:
 # Look for common macro markup errors
 CHECK_MARKUP = git grep -n -E -f $(ROOTDIR)/config/CI/markup $(MARKUP_SPEC_SOURCES)
 check-markup:
-	if test `$(CHECK_MARKUP) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_MARKUP) | wc -l` != 0 ; then \
 	    echo "Common macro markup errors found. Please refer to the style guide or similar markup in current main branch for fixes:" ; \
 	    $(CHECK_MARKUP) ; \
 	    exit 1 ; \
@@ -538,14 +539,14 @@ check-markup:
 # Look for asciidoctor conditionals inside VU statements; and for
 # duplicated VUID numbers, but only in spec sources.
 check-reflow:
-	$(PYTHON) $(SCRIPTS)/reflow.py -nowrite -noflow -check FAIL -checkVUID FAIL $(SPECFILES)
+	$(QUIET) $(PYTHON) $(SCRIPTS)/reflow.py -nowrite -noflow -check FAIL -checkVUID FAIL $(SPECFILES)
 
 # Look for files whose Khronos copyright has not been updated to the
 # current year
 DATE_YEAR = $(shell date +%Y)
 CHECK_DATES = git grep -z -l 'Copyright.*The Khronos' | xargs -0 git grep -L 'Copyright.*$(DATE_YEAR).*The Khronos'
 check-copyright-dates:
-	if test `$(CHECK_DATES) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_DATES) | wc -l` != 0 ; then \
 	    echo "Files with out-of-date Khronos copyrights (must be updated to $(DATE_YEAR):" ; \
 	    $(CHECK_DATES) ; \
 	    exit 1 ; \
@@ -554,51 +555,55 @@ check-copyright-dates:
 # Look for proper use of custom markup macros
 #   --ignore_count 0 can be incremented if there are unfixable errors
 check-links:
-	$(PYTHON) $(SCRIPTS)/check_spec_links.py -Werror --ignore_count 0
+	$(QUIET) $(PYTHON) $(SCRIPTS)/check_spec_links.py -Werror --ignore_count 0
 
 # Perform XML consistency checks
 # Use '-warn' option to display warnings as well as errors
 CHECK_UGLY_TYPE_DECL = git grep -E '</type>\*+<name>' $(VKXML)
 check-consistency:
-	$(PYTHON) $(SCRIPTS)/xml_consistency.py
-	if test `$(CHECK_UGLY_TYPE_DECL) | wc -l` != 0 ; then \
+	$(QUIET) $(PYTHON) $(SCRIPTS)/xml_consistency.py
+	$(QUIET) if test `$(CHECK_UGLY_TYPE_DECL) | wc -l` != 0 ; then \
 	    echo "XML contains declarations lacking whitespace:" ; \
 	    $(CHECK_UGLY_TYPE_DECL) ; \
 	    exit 1 ; \
 	fi
 
 # Look for untagged use of 'undefined' in spec sources
 check-undefined:
-	$(SCRIPTS)/ci/check_undefined
+	$(QUIET) $(SCRIPTS)/ci/check_undefined
 
 # Look for use of custom macros in the proposals and other
 # non-Specification document (except for the ChangeLog*.adoc) markup
 CHECK_CUSTOM_MACROS = git grep -n -E -f $(ROOTDIR)/config/CI/custom-macros [A-Z][A-Z]*.adoc proposals/
 CHECK_PROPOSALS = git grep -n -E -f $(ROOTDIR)/config/CI/proposals-disallowed proposals/
 check-custom-macros:
-	if test `$(CHECK_CUSTOM_MACROS) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_CUSTOM_MACROS) | wc -l` != 0 ; then \
 	    echo "Found use of specification macros in proposal or repository metadocumentation, where they are not allowed. Please use straight asciidoc markup like *must* for fixes:" ; \
 	    $(CHECK_CUSTOM_MACROS) ; \
 	    exit 1 ; \
 	fi
-	if test `$(CHECK_PROPOSALS) | wc -l` != 0 ; then \
-	    echo "Found use of {refpage} attribute in proposals (use {docs} or {extensions}, see proposals/template.adoc); or of asciidoctor markup which cannot be rendered on github, such as include: or asciimath: directives:" ; \
+	$(QUIET) if test `$(CHECK_PROPOSALS) | wc -l` != 0 ; then \
+	    echo "Found use of one or more of:" ; \
+	    echo "  - {extensions} attribute in proposals (use xref:{docs} or xref:{refpages})" ; \
+	    echo "  - link: used with {docs} or {extensions} (use xref:)" ; \
+	    echo "  - asciidoctor markup which cannot be rendered on github, such as include: or asciimath: directives" ; \
+	    echo "(see proposals/template.adoc) for examples" ; \
 	    $(CHECK_PROPOSALS) ; \
 	    exit 1 ; \
 	fi
 
 # Look for '.txt' and '.asciidoc' files, which should almost all be .adoc now
 CHECK_TXTFILES = find . -name '*.txt' -o -name '*.asciidoc' | grep -v -E -f $(ROOTDIR)/config/CI/txt-files-allowed
 check-txtfiles:
-	if test `$(CHECK_TXTFILES) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_TXTFILES) | wc -l` != 0 ; then \
 	    echo "*.txt and/or .asciidoc files found that are not allowed (use .adoc):" ; \
 	    $(CHECK_TXTFILES) ; \
 	    exit 1 ; \
 	fi
 
 # Check for valid xrefs in the output html
 check-xrefs: $(HTMLDIR)/vkspec.html
-	$(PYTHON) $(SCRIPTS)/check_html_xrefs.py $(HTMLDIR)/vkspec.html
+	$(QUIET) $(PYTHON) $(SCRIPTS)/check_html_xrefs.py $(HTMLDIR)/vkspec.html
 
 # Check for stuff that should not be published.
 # This is not part of 'allchecks' since it would fail in most new
@@ -608,7 +613,7 @@ check-internal-phrasing: check-proposed check-gitlab
 # Check for UNRESOLVED or PROPOSED issues in extension appendices
 CHECK_PROPOSED = git grep -n -E 'PROPOSED|UNRESOLVED' $(SPECDIR)/appendices/
 check-proposed:
-	if test `$(CHECK_PROPOSED) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_PROPOSED) | wc -l` != 0 ; then \
 	    echo "PROPOSED or UNRESOLVED issues should not be published in extension appendices:" ; \
 	    $(CHECK_PROPOSED) ; \
 	    exit 1 ; \
@@ -617,7 +622,7 @@ check-proposed:
 # Check for internal gitlab links anywhere in markup sources
 CHECK_GITLAB = git grep -n 'gitlab.khronos.org' $(MARKUP_SPEC_SOURCES) proposals/
 check-gitlab:
-	if test `$(CHECK_GITLAB) | wc -l` != 0 ; then \
+	$(QUIET) if test `$(CHECK_GITLAB) | wc -l` != 0 ; then \
 	    echo "Internal gitlab.khronos.org links should not be published, use corresponding github links instead:" ; \
 	    $(CHECK_GITLAB) ; \
 	    exit 1 ; \

config/CI/proposals-disallowed

@@ -1,4 +1,4 @@
-:refpage:
-\{refpage\}
+link:\{(docs|refpages)\}
+\{extensions\}
 (^|[^-_.&:<>\[[:alnum:]])(asciimath|latexmath|stem):
 ^include::

proposals/VK_EXT_descriptor_heap.adoc

@@ -772,7 +772,7 @@ There are no absolute guarantees that replay will succeed, as system updates, me
 Implementations are expected to provide a best effort to ensure captured descriptors can be replayed, but are not expected to work around exceptional circumstances, or across driver versions or devices.
 
 For the best chance of success, applications should replay in a separate process, using the same system, driver, and device, without any updates since the replay.
-Additionally, tools must capture some data from the implementation during capture to give the implementation the information to recreate identical descriptors during replay, should use an identically created xref:{refpage}VkDevice.html[VkDevice] and xref:{refpage}VkInstance.html[VkInstance], and should create all captured descriptors before creating any others for use in the tool.
+Additionally, tools must capture some data from the implementation during capture to give the implementation the information to recreate identical descriptors during replay, should use an identically created xref:{refpages}VkDevice.html[VkDevice] and xref:{refpages}VkInstance.html[VkInstance], and should create all captured descriptors before creating any others for use in the tool.
 
 
 ==== Samplers