Skip to content

Commit a4ac530

Browse files
committed
Merge branch 'testing_uk' into docs_references
2 parents c2216c8 + a659a16 commit a4ac530

File tree

8 files changed

+10
-14
lines changed

8 files changed

+10
-14
lines changed

docs/src/Submakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ A2X = a2x --xsltproc-opts "--nonet \
379379
--stringparam toc.max.depth 2 \
380380
--stringparam generate.section.toc.level 2 \
381381
--stringparam generate.toc 'book toc,title chapter toc'" \
382+
--keep-artifacts \
382383
-a "scriptdir=$(DOC_SRCDIR)/" \
383384
--asciidoc-opts="-f $(DOC_SRCDIR)/docbook.conf" \
384385
--asciidoc-opts="-f $(DOC_SRCDIR)/asciidoc-dont-replace-arrows.conf" \

docs/src/code/contributing-to-linuxcnc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ programs and libraries, and the source text for the documentation.
2222

2323
The two main ways that project developers communicate with each other are:
2424

25-
* Via IRC, at irc://irc.libera.chat/%23linuxcnc-devel[#linuxcnc-devel]
25+
* Via IRC, at irc://irc.libera.chat/#linuxcnc-devel[#linuxcnc-devel]
2626
on https://libera.chat/[Libera.chat].
2727
* Via email, on the https://lists.sourceforge.net/lists/listinfo/emc-developers[developers' mailing list]
2828

docs/src/code/style-guide.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ Only loop control statements must be included in a for() construct,
239239
e.g., `sum = 0; for (i=0; i<10; i++) { sum += value[i]; }` +
240240
NOT: `for (i=0, sum=0; i<10; i++) sum += value[i];`.
241241

242-
Likewise, executable statements in conditionals must be avoided, e.g.,
243-
`if (fd = open(file_name)` is bad.
242+
Likewise, executable statements in conditionals must be avoided,
243+
e.g., `if (fd = open(file_name))` is bad.
244244

245245
Complex conditional statements should be avoided - Introduce temporary
246246
boolean variables instead.

docs/src/common/overleaf.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ writing, editing, or graphic preparation please contact any member
55
of the writing team or join and send an email to
66
emc-users@lists.sourceforge.net.
77

8-
Copyright © 2000-2020 LinuxCNC.org
8+
Copyright © 2000-2025 LinuxCNC.org
99

1010
Permission is granted to copy, distribute and/or modify this document
1111
under the terms of the GNU Free Documentation License, Version 1.1

docs/src/gui/axis.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Do not use 'Run From Selected Line' if your G-code program contains subroutines.
184184
* 'Unhoming' - Unhome one or all axes.
185185
* 'Zero Coordinate System' - Set all offsets to zero in the coordinate system chosen.
186186
//[[sub:axis:tool-touch-off]]
187-
* Tool Touch Off (((AXIS, Tool Touch Off)))
187+
* Tool Touch Off(((AXIS, Tool Touch Off)))
188188
** 'Tool touch off to workpiece' - When performing Touch Off, the value
189189
entered is relative to the current workpiece ('G5x') coordinate system,
190190
as modified by the axis offset ('G92'). When the Touch Off is complete,
@@ -362,8 +362,7 @@ To move the program so it's within the machine's travel in this case,
362362
jog to the left and Touch Off X again.
363363

364364
[[fig:soft-limits]]
365-
.Soft Limits
366-
(((Soft Limits)))
365+
.Soft Limits(((Soft Limits)))
367366
image::images/axis-outofrange.png["Soft Limits",align="center"]
368367

369368
.Tool Cone

docs/src/gui/qtdragon.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,6 @@ Change the G-code text display colors/fonts:
16801680

16811681
[source,{ini}]
16821682
----
1683-
}
16841683
EditorBase{
16851684
background:black;
16861685
qproperty-styleColorCursor:white;

docs/src/hal/hal-examples.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ The following figure shows the result when the X axis is moving at 15 IPM in the
158158
Notice that we can get the absolute value from either the `abs.0.out` pin or the `X-IPM` signal.
159159

160160
[[cap:hal-velocity-example]]
161-
.HAL: Velocity Example
162-
(((HAL:Velocity example)))
161+
.HAL: Velocity Example(((HAL:Velocity example)))
163162
image::images/velocity-01.png["HAL: Velocity Example",align="center"]
164163

165164
== Soft Start Details

docs/src/lathe/lathe-user.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,14 @@ image::images/tool-positions_en.svg["Lathe Tool Orientations",align="center"]
7474
In AXIS the following figures show what the Tool Positions look like, as entered in the tool table.
7575

7676
[[fig:Outil-Positions-1-2-3-4]]
77-
.Tool Positions 1, 2, 3 & 4
78-
(((Tool Positions 1, 2, 3 & 4)))
77+
.Tool Positions 1, 2, 3 & 4(((Tool Positions 1, 2, 3 & 4)))
7978
image:images/tool-pos-1_en.svg["Tool Position 1"]
8079
image:images/tool-pos-2_en.svg["Tool Position 2"]
8180
image:images/tool-pos-3_en.svg["Tool Position 3"]
8281
image:images/tool-pos-4_en.svg["Tool Position 4"]
8382

8483
[[fig:Outil-Positions-5-6-7-8]]
85-
.Tool Positions 5, 6, 7 & 8
86-
(((Tool Positions 5, 6, 7 & 8)))
84+
.Tool Positions 5, 6, 7 & 8(((Tool Positions 5, 6, 7 & 8)))
8785
image:images/tool-pos-5_en.svg["Tool Position 5"]
8886
image:images/tool-pos-6_en.svg["Tool Position 6"]
8987
image:images/tool-pos-7_en.svg["Tool Position 7"]

0 commit comments

Comments
 (0)