From cdd4bb3ec9f665c13473792ee0f5f34f1261c76d Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Tue, 21 Feb 2023 08:59:41 -0700
Subject: Restore markup of Builder in PR 4299  [skip appveyor]

The add-method chapter now has entity references to &Builder; back.
The markup for &Builder; is changed from <classname> to <indexterm>,
as used it's a concept, and there is no actual class named Builder anyway.

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 doc/scons.mod           | 4 ++--
 doc/user/add-method.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/scons.mod b/doc/scons.mod
index ea1decc..ebe0e6f 100644
--- a/doc/scons.mod
+++ b/doc/scons.mod
@@ -100,7 +100,7 @@
 <!ENTITY CommandAction "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>CommandAction</classname>">
 <!ENTITY FunctionAction "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>FunctionAction</classname>">
 <!ENTITY ListAction "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>ListAction</classname>">
-<!ENTITY Builder "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Builder</classname>">
+<!ENTITY Builder "<glossterm xmlns='http://www.scons.org/dbxsd/v1.0'>Builder</glossterm>">
 <!ENTITY BuilderBase "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>BuilderBase</classname>">
 <!ENTITY CompositeBuilder "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>CompositeBuilder</classname>">
 <!ENTITY MultiStepBuilder "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>MultiStepBuilder</classname>">
@@ -110,7 +110,7 @@
 <!ENTITY Parallel "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Parallel</classname>">
 <!ENTITY Node "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Node</classname>">
 <!ENTITY Node_FS "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Node.FS</classname>">
-<!ENTITY Scanner "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Scanner</classname>">
+<!ENTITY Scanner "<glossterm xmlns='http://www.scons.org/dbxsd/v1.0'>Scanner</glossterm>">
 <!ENTITY Sig "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Sig</classname>">
 <!ENTITY Signature "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Signature</classname>">
 <!ENTITY Taskmaster "<classname xmlns='http://www.scons.org/dbxsd/v1.0'>Taskmaster</classname>">
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index 86297de..d25ba9a 100644
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -31,10 +31,10 @@ Copyright The SCons Foundation
 
   The &f-link-AddMethod; function is used to add a method
   to an environment.  It is typically used to add a "pseudo-builder,"
-  a function that looks like a Builder but
-  wraps up calls to multiple other Builder's
+  a function that looks like a &Builder; but
+  wraps up calls to multiple other &Builder;'s
   or otherwise processes its arguments
-  before calling one or more Builders.
+  before calling one or more &Builder;s.
   In the following example,
   we want to install the program into the standard
   <filename>/usr/bin</filename> directory hierarchy,
@@ -71,7 +71,7 @@ int main() { printf("Hello, world!\n"); }
   <para>
 
   A pseudo-builder is useful because it provides more flexibility
-  in parsing arguments than you can get with a standard Builder method.
+  in parsing arguments than you can get with a standard &Builder;.
   The next example shows a pseudo-builder with a
   named argument that modifies the filename, and a separate argument
   for the resource file (rather than having the builder figure it out
-- 
cgit v0.12