Skip to content

Commit 8074bf1

Browse files
authored
Merge pull request #4764 from mwichmann/doc/uguide-tags
Add remaining links to User Guide sections
2 parents c132c82 + 9f120d2 commit 8074bf1

31 files changed

+191
-163
lines changed

CHANGES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
183183
and unchanged target and source lists are accounted for to resolve.
184184
Fixes #3029.
185185
- Improve documentation of builder methods and builder objects.
186+
- Add tags to the remaining section headers in the User Guide. This is
187+
visible only in two ways: it's possible to link to any section now,
188+
and the generated html will no longer have obscure links
189+
(e.g. https://scons.org/doc/production/HTML/scons-user.html#id1514)
190+
that may change over time.
186191

187192

188193
RELEASE 4.9.1 - Thu, 27 Mar 2025 11:40:20 -0700

RELEASE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ DOCUMENTATION
156156

157157
- Improve documentation of builder methods and builder objects.
158158

159+
- All the User Guide sections now have textual anchors, meaning there
160+
no longer be build-generated numeric tags like
161+
https://scons.org/doc/production/HTML/scons-user.html#id1514
162+
159163
DEVELOPMENT
160164
-----------
161165

doc/user/actions.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ This file is processed by the bin/SConsDoc.py module.
2929
xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
3030
<title>&SCons; Actions</title>
3131

32-
<!--
32+
<!-- TOOD: placeholder file, not currently included in build -->
33+
34+
<!-- cons reference documentation:
3335
3436
=head1 Build actions
3537
@@ -272,10 +274,10 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
272274

273275
</para>
274276

275-
<section>
277+
<section id="sect-cmdstr-actions">
276278
<title>Command Strings as Actions</title>
277279

278-
<section>
280+
<section id="sect-suppress-cmdline">
279281
<title>Suppressing Command-Line Printing</title>
280282

281283
<para>
@@ -286,7 +288,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
286288

287289
</section>
288290

289-
<section>
291+
<section id="sect-ignore-exit-status">
290292
<title>Ignoring Exit Status</title>
291293

292294
<para>
@@ -299,7 +301,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
299301

300302
</section>
301303

302-
<section>
304+
<section id="sect-arglist-actions">
303305
<title>Argument Lists as Actions</title>
304306

305307
<para>
@@ -310,7 +312,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
310312

311313
</section>
312314

313-
<section>
315+
<section id="sect-python-func-actions">
314316
<title>Python Functions as Actions</title>
315317

316318
<para>
@@ -321,10 +323,10 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
321323

322324
</section>
323325

324-
<section>
326+
<section id="sect-modify-printing">
325327
<title>Modifying How an Action is Printed</title>
326328

327-
<section>
329+
<section id="sect-strfunc-cmdstr">
328330
<title>XXX: the &strfunction; keyword argument</title>
329331

330332
<para>
@@ -335,7 +337,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
335337

336338
</section>
337339

338-
<section>
340+
<section id="sect-cmdstr-cmdstr">
339341
<title>XXX: the &cmdstr; keyword argument</title>
340342

341343
<para>
@@ -348,7 +350,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
348350

349351
</section>
350352

351-
<section>
353+
<section id="sect-varlist">
352354
<title>Making an Action Depend on Variable Contents: the &varlist; keyword argument</title>
353355

354356
<para>
@@ -359,7 +361,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
359361

360362
</section>
361363

362-
<section>
364+
<section id="sect-chdir">
363365
<title>chdir=1</title>
364366

365367
<para>
@@ -370,7 +372,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
370372

371373
</section>
372374

373-
<section>
375+
<section id="sect-batch-key">
374376
<title>Batch Building of Multiple Targets from Separate Sources: the &batch_key; keyword argument</title>
375377

376378
<para>
@@ -381,7 +383,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
381383

382384
</section>
383385

384-
<section>
386+
<section id="sect-exitstatfunc">
385387
<title>Manipulating the Exit Status of an Action: the &exitstatfunc; keyword argument</title>
386388

387389
<para>
@@ -396,7 +398,7 @@ b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
396398
397399
???
398400
399-
<section>
401+
<section id="sect-presub">
400402
<title>presub=</title>
401403
402404
<para>

doc/user/ant.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ This file is processed by the bin/SConsDoc.py module.
2929
xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
3030
<title>Converting From Ant</title>
3131

32+
<!-- TOOD: placeholder file, not currently included in build -->
33+
3234
<para>
3335

3436
XXX
3537

3638
</para>
3739

38-
<section>
40+
<section id="sect-ant-diff">
3941
<title>Differences Between &Ant; and &SCons;</title>
4042

4143
<para>
@@ -46,7 +48,7 @@ This file is processed by the bin/SConsDoc.py module.
4648

4749
</section>
4850

49-
<section>
51+
<section id="sect-ant-adv">
5052
<title>Advantages of &SCons; Over &Ant;</title>
5153

5254
<para>

doc/user/build-install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ $ <emphasis>activate a virtualenv and run 'scons' to use that version</emphasis>
366366

367367
<!--
368368
369-
<section>
369+
<section id="sect-python-basics">
370370
<title>Python Basics</title>
371371
372372
<para>

0 commit comments

Comments
 (0)