Skip to content

Commit f4b383a

Browse files
Merge pull request #3060 from smoe/docs_wording_20240807
docs: man/man1/*.adoc - review asciidoc formatting (smoe:docs_wording_20240807)
2 parents c9b5280 + c466813 commit f4b383a

40 files changed

Lines changed: 756 additions & 880 deletions

docs/src/gcode/overview.adoc

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,13 @@ digit is a single character between 0 and 9.
175175
** an optional plus or minus sign, followed by
176176
** zero to many digits, followed, possibly, by
177177
** one decimal point, followed by
178-
** zero to many digits - provided that there is at least
179-
one digit somewhere in the number.
178+
** zero to many digits - provided that there is at least one digit somewhere in the number.
180179
* There are two kinds of numbers:
181180
** Integers, that does not have a decimal point,
182181
** Decimals, that do have a decimal point.
183-
* Numbers may have any number of digits, subject to the limitation on
184-
line length. Only about seventeen significant figures will be retained,
185-
however (enough for all known applications).
186-
* A non-zero number with no sign but the first character is assumed to be
187-
positive.
182+
* Numbers may have any number of digits, subject to the limitation on line length.
183+
Only about seventeen significant figures will be retained, however (enough for all known applications).
184+
* A non-zero number with no sign but the first character is assumed to be positive.
188185

189186
Notice that initial (before the decimal point and the first non-zero
190187
digit) and trailing (after the decimal point and the last non-zero
@@ -222,9 +219,9 @@ Syntax:: There are three kinds of syntactic appearance:
222219
* 'named local' - #<localvalue>
223220
* 'named global' - #<_globalvalue>
224221

225-
Scope:: The scope of a parameter is either global, or local within a
226-
subroutine. Subroutine parameters and local named variables have local
227-
scope. Global named parameters and numbered parameters starting from
222+
Scope:: The scope of a parameter is either global, or local within a subroutine.
223+
Subroutine parameters and local named variables have local scope.
224+
Global named parameters and numbered parameters starting from
228225
number 31 are global in scope. RS274/NGC uses 'lexical scoping' -
229226
in a subroutine only the local variables defined therein, and any
230227
global variables are visible. The local variables of a
@@ -257,12 +254,9 @@ Intended Use::
257254
available for general-purpose storage of floating-point values, like
258255
intermediate results, flags etc, throughout program execution. They
259256
are read/write (can be assigned a value).
260-
* <<sub:subroutine-parameters,subroutine parameters>> - these are used to
261-
hold the actual parameters passed to a subroutine.
262-
* <<sub:numbered-parameters,numbered parameters>> - most of these are used
263-
to access offsets of coordinate systems.
264-
* <<sub:system-parameters,system parameters>> - used to determine the current
265-
running version. They are read-only.
257+
* <<sub:subroutine-parameters,subroutine parameters>> - these are used to hold the actual parameters passed to a subroutine.
258+
* <<sub:numbered-parameters,numbered parameters>> - most of these are used to access offsets of coordinate systems.
259+
* <<sub:system-parameters,system parameters>> - used to determine the current running version. They are read-only.
266260

267261
[[sub:numbered-parameters]]
268262
=== Numbered Parameters(((Numbered Parameters)))
@@ -287,8 +281,7 @@ A parameter setting does not take
287281
effect until after all parameter values on the same line have been
288282
found. For example, if parameter 3 has been previously set to 15 and
289283
the line '#3=6 G1 X#3' is interpreted, a straight move to a point
290-
where X equals 15 will
291-
occur and the value of parameter 3 will be 6.
284+
where X equals 15 will occur and the value of parameter 3 will be 6.
292285

293286
The '\#' character takes precedence over other operations, so that, for
294287
example, '\#1+2' means the number found by adding 2 to the value of

docs/src/getting-started/getting-linuxcnc.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ uname -v
331331
document.
332332

333333
. Add the LinuxCNC Archive Signing Key to your apt keyring by downloading
334-
[the LinuxCNC installer script](https://www.linuxcnc.org/linuxcnc-install.sh)
334+
[the LinuxCNC installer script](https://www.linuxcnc.org/linuxcnc-install.sh).
335335
You will need to make the script executable to run it:
336336
+
337337
----
@@ -351,8 +351,8 @@ sudo ./linuxcnc-install.sh
351351
install, or alternatively on a fresh Install of Debian Bookworm 64-bit
352352
as described above.
353353
. You can add the LinuxCNC archive signing key and repository information
354-
by downloading and running the installer script as described above. If
355-
an RTAI kernel is detected it will stop before installing any packages.
354+
by downloading and running the installer script as described above.
355+
If an RTAI kernel is detected it will stop before installing any packages.
356356
. Update the package list from linuxcnc.org
357357
+
358358
----
@@ -363,8 +363,7 @@ sudo apt-get update
363363
----
364364
sudo apt-get install linuxcnc
365365
----
366-
Reboot the machine, ensuring that the system boots from the new 5.4.258-rtai
367-
kernel.
366+
Reboot the machine, ensuring that the system boots from the new 5.4.258-rtai kernel.
368367

369368
=== Installing on Raspbian 12
370369

docs/src/gui/qtvcp-widgets.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ It is based on PyQt's `QGridLayout`.
181181
image::images/qthalbar.png["QtVCP HalBar: Panel demonstrating the HAL Bar Level Indicator ",scale="25%"]
182182

183183
This widget is used to indicate level or value, usually of a HAL s32/float pin. +
184-
you can also disable the HAL pin and use Qt signals or python commands to change the level. +
184+
You can also disable the HAL pin and use Qt signals or Python commands to change the level. +
185185

186186
==== Bar Properties:
187187
HalBar is a subclass of the Bar widget, so it inherits these properties +
@@ -1693,7 +1693,7 @@ It is based on PyQt's _QLabel_.
16931693
//TODO StatusLabel widget capture/example
16941694

16951695
This will display a label based on selectable status of the machine controller. +
1696-
You can change how the status will be displayed by substituting python formatting code in the text template. You can also use rich text for different fonts/colors etc.
1696+
You can change how the status will be displayed by substituting Python formatting code in the text template. You can also use rich text for different fonts/colors etc.
16971697

16981698
.Selectable States
16991699
These states are selectable:

docs/src/man/man1/iov2.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Report bugs at https://github.com/LinuxCNC/linuxcnc/issues.
9595

9696
== AUTHOR
9797

98-
Derived from a work by Fred Proctor & Will Shackleford.
98+
Derived from a work by Fred Proctor & Will Shackleford.
9999
Rework & adding v2 protocol support by Michael Haberler.
100100

101101
== COPYRIGHT

docs/src/man/man1/linuxcncrsh.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ _jog joint_number_ | _axis_letter_ _<speed>_::
355355
With set, runs the opened program. If no StartLine is specified, runs
356356
from the beginning. If a StartLine is specified, start line, runs from
357357
that line. A start line of -1 runs in verify mode.
358-
358+
359359
*pause*::
360360
With set, pause program execution.
361361

docs/src/man/man1/mb2hal.1.adoc

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,75 +6,80 @@ mb2hal - HAL non-realtime component for Modbus
66

77
== SYNOPSIS
88

9-
Default component name:::
9+
Default component name::
1010
loadusr -W mb2hal config=config_file.ini
11-
Custom component name: ::
11+
Custom component name::
1212
loadusr -Wn mymodule mb2hal config=config_file.ini
1313

1414
== DESCRIPTION
1515

16-
MB2HAL is a generic non-realtime HAL component to communicate with one
17-
or more Modbus devices. It supports Modbus RTU and Modbus TCP.
16+
MB2HAL is a generic non-realtime HAL component to communicate with one or more Modbus devices.
17+
It supports Modbus RTU and Modbus TCP.
1818

19-
See http://linuxcnc.org/docs/html/drivers/mb2hal.html[] for more
20-
information.
19+
See http://linuxcnc.org/docs/html/drivers/mb2hal.html[] for more information.
2120

2221
== PINS
2322

2423
=== fnct_01_read_coils:
2524

26-
*mb2hal.m.n.bit bit out* +
27-
*mb2hal.m.n.bit-inv bit out*::
25+
*mb2hal.m.n.bit* bit out +
26+
*mb2hal.m.n.bit-inv* bit out
2827

2928
=== fnct_02_read_discrete_inputs:
3029

31-
*mb2hal.m.n.bit bit out* +
32-
*mb2hal.m.n.bit-inv bit out*::
30+
*mb2hal.m.n.bit* bit out +
31+
*mb2hal.m.n.bit-inv* bit out
3332

3433
=== fnct_03_read_holding_registers:
3534

36-
*mb2hal.m.n.float float out* +
37-
*mb2hal.m.n.int s32 out*::
35+
*mb2hal.m.n.float* float out +
36+
*mb2hal.m.n.int* s32 out
3837

3938
=== fnct_04_read_input_registers:
4039

41-
*mb2hal.m.n.float float out* +
42-
*mb2hal.m.n.int s32 out*::
40+
*mb2hal.m.n.float* float out +
41+
*mb2hal.m.n.int* s32 out
4342

4443
=== fnct_05_write_single_coil:
4544

46-
*mb2hal.m.n.bit bit in*::
45+
*mb2hal.m.n.bit* bit in::
4746
NELEMENTS needs to be 1 or PIN_NAMES must contain just one name.
4847

4948
=== fnct_06_write_single_register:
5049

51-
*mb2hal.m.n.float float in* +
52-
*mb2hal.m.n.int s32 in*::
53-
NELEMENTS needs to be 1 or PIN_NAMES must contain just one name. Both
54-
pin values are added and limited to 65535 (UINT16_MAX). Use one and
55-
let the other open (read as 0).
50+
*mb2hal.m.n.float* float in
51+
52+
*mb2hal.m.n.int* s32 in::
53+
NELEMENTS needs to be 1 or PIN_NAMES must contain just one name. +
54+
Both pin values are added and limited to 65535 (UINT16_MAX).
55+
Use one and let the other open (read as 0).
5656

5757
=== fnct_15_write_multiple_coils:
5858

59-
*mb2hal.m.n.bit bit in*::
59+
*mb2hal.m.n.bit* bit in
6060

6161
=== fnct_16_write_multiple_registers:
6262

63-
*mb2hal.m.n.float float in* +
64-
*mb2hal.m.n.int s32 in*::
65-
Both pin values are added and limited to 65535 (UINT16_MAX). Use one
66-
and let the other open (read as 0).
63+
*mb2hal.m.n.float* float in
64+
65+
*mb2hal.m.n.int* s32 in::
66+
Both pin values are added and limited to 65535 (UINT16_MAX).
67+
Use one and let the other open (read as 0).
6768

6869
=== Each transaction
6970

70-
*mb2hal.m.num_errors u32 in* Error counter
71+
*mb2hal.m.num_errors* u32 in::
72+
Error counter
7173

72-
m = HAL_TX_NAME or transaction number if not set, n = element number
73-
(NELEMENTS) +
74-
Example: +
75-
mb2hal.00.01.int (TRANSACTION_00, second register) +
76-
mb2hal.readStatus.01.bit (HAL_TX_NAME=readStatus, first bit)
7774

75+
m = HAL_TX_NAME or transaction number if not set +
76+
n = element number (NELEMENTS)
77+
78+
Example:
79+
....
80+
mb2hal.00.01.int (TRANSACTION_00, second register)
81+
mb2hal.readStatus.01.bit (HAL_TX_NAME=readStatus, first bit)
82+
....
7883
== AUTHOR
7984

8085
Victor Rocco

docs/src/man/man1/mdi.1.adoc

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,28 @@ instance
1111

1212
== DESCRIPTION
1313

14-
*mdi* sends G-code commands to LinuxCNC. The command starts an
15-
envirmonemt in which G-code commands are sent to the interpreter and
16-
machine feedback is displayed.
14+
*mdi* sends G-code commands to LinuxCNC.
15+
The command starts an envirmonemt in which G-code commands are sent to the interpreter and machine feedback is displayed.
1716

1817
== USAGE
1918

20-
send a single command and exit mdi m2 s1400
19+
send a single command and exit:
20+
....
21+
mdi m2 s1400
22+
....
2123

22-
interactive session $mdi MDI> m3 s1000 MDI> G0 X100 MDI> ^Z $stopped
24+
interactive session
25+
....
26+
$mdi
27+
MDI> m3 s1000
28+
MDI> G0 X100
29+
MDI>` ^Z
30+
$stopped
31+
....
2332

2433
== SEE ALSO
2534

26-
linuxcnc(1)*
35+
*linuxcnc(1)*
2736

2837
Much more information about LinuxCNC and HAL is available in the
2938
LinuxCNC and HAL User Manuals, found at /usr/share/doc/LinuxCNC/.

0 commit comments

Comments
 (0)