Skip to content

Commit fb4d6a1

Browse files
authored
Merge pull request #2775 from smoe/translation_breaking_po4a
docs: triggered while translating
2 parents f0eb99f + 71ebc9c commit fb4d6a1

7 files changed

Lines changed: 12 additions & 19 deletions

File tree

docs/src/config/ini-config.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,19 +1295,18 @@ image::images/encoder-scale.png[align="center"]
12951295

12961296
The _<num>_ specifies the spindle number 0 ... (num_spindles-1) +
12971297
The value of _num_spindles_ is set by `[TRAJ]SPINDLES=` . +
1298-
By default maximum velocity of the spindle in forward and reverse is approximately
1299-
2147483000 RPM. +
1298+
By default maximum velocity of the spindle in forward and reverse is approximately 2147483000 RPM. +
13001299
By default minimum velocity of the spindle in forward and reverse is 0 RPM. +
13011300
By default the increment is 100 RPM. +
13021301
You change these default by setting the following INI variables:
13031302

13041303
[NOTE]
1305-
These settings are for the motion controller component. Control screens can limit
1306-
these settings further.
1304+
These settings are for the motion controller component.
1305+
Control screens can limit these settings further.
13071306

13081307
* `MAX_FORWARD_VELOCITY = 20000`
13091308
The maximum spindle speed (in rpm) for the specified spindle. Optional.
1310-
This will also set MIN_FORWARD_VELOCITY to the negative value unless overridden.
1309+
This will also set MAX_REVERSE_VELOCITY to the negative value unless overridden.
13111310
* `MIN_FORWARD_VELOCITY = 3000`
13121311
The minimum spindle speed (in rpm) for the specified spindle. Optional.
13131312
Many spindles have a minimum speed below which they should not be run.

docs/src/config/iov2.adoc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,13 @@ INI file options:
5353
.[EMCIO] section
5454
PROTOCOL_VERSION = 2 :: Defaults to 2. Setting to 1 will emulate old iocontrol behaviour.
5555

56-
EMCIO = iov2 -support-start-change :: You need to explicitly enable the start-change protocol by adding the
57-
-support-start-change option; otherwise the start-change pin remains
58-
low and start-change-ack is ignored. The reason for this is better
59-
backwards compatibility.
56+
EMCIO = iov2 -support-start-change :: You need to explicitly enable the start-change protocol by adding the -support-start-change option; otherwise the start-change pin remains low and start-change-ack is ignored. The reason for this is better backwards compatibility.
6057

6158
.[TASK] section
62-
IO_ERROR :: Printf-style template for operator error display (negative toolchanger fault codes).
63-
No quoting needed. Example: `IO_ERROR = Toolchanger fault %d`. Default: toolchanger error %d.
59+
IO_ERROR :: Printf-style template for operator error display (negative toolchanger fault codes). No quoting needed. Example: `IO_ERROR = Toolchanger fault %d`. Default: toolchanger error %d.
6460

6561
.[EMC] section +
66-
DEBUG :: To get a (quite detailed) trace,
67-
set either the RCS debugging flag (0x00000200) to turn on RCS debugging messages all over LinuxCNC or use the new iocontrol debugging bit (0x00001000) only for iov2 messages.
62+
DEBUG :: To get a (quite detailed) trace, set either the RCS debugging flag (0x00000200) to turn on RCS debugging messages all over LinuxCNC or use the new iocontrol debugging bit (0x00001000) only for iov2 messages.
6863

6964
== Pins
7065

docs/src/drivers/hal_gpio.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The version of libgpiod-dev installed can be determined by the command "gpioinfo
9494

9595
* 'hal_gpio.reset' - Only exported if there are pins defined in the reset list. This should be placed after the "write" function, and should be in the same thread.
9696

97-
Typically the 'read' function will be early in the call list, before any encoder counters and the 'write' function will be later in the call list, after stepgen.make-pulses.
97+
Typically the 'read' function will be early in the call list, before any encoder counters and the 'write' function will be later in the call list, after `stepgen.make-pulses`.
9898

9999

100100
== Pin Identification

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ new users and are organized around supported GUIs:
4949
* 'qtdragon_hd' - Touch Screen GUI, high definition
5050
* 'qtplasmac' - Touch Screen GUI, for plasma tables
5151
* 'qttouchy' - Touch Screen GUI
52-
* 'tklinuxcnc' - Keyboard and Mouse Gui (no longer maintained)
52+
* 'tklinuxcnc' - Keyboard and Mouse GUI (no longer maintained)
5353
* 'touchy' - Touch Screen GUI
5454
* 'woodpecker' - Touch Screen GUI
5555
A GUI configuration directory may contain subdirectories with

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Versions of LinuxCNC before 2.9.0 used to handle an incorrect
197197
`[TASK]INTERPRETER` setting by automatically falling back to using the
198198
default G-code interpreter.
199199

200-
As of 2.9.0, an incorrect `[TASK]INTERPRETER` value will cause
200+
Since 2.9.0, an incorrect `[TASK]INTERPRETER` value will cause
201201
LinuxCNC to refuse to start up. Fix this condition by deleting the
202202
`[TASK]INTERPRETER` setting from your INI file, so that LinuxCNC will
203203
use the default G-code interpreter.

docs/src/gui/gladevcp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,7 @@ See the getting-started/running-linuxcnc section for 'Adding Configuration Selec
28172817

28182818
For testing, a runtime specification of auxiliary applications may be specified using the exported environmental variable: GLADEVCP_EXTRAS.
28192819
This variable should be a path list of one or more configuration directories separated by a (:).
2820-
Typically, this variable would be set in a shell starting `linuxcnc` or in a user's `~/.profile startup` script.
2820+
Typically, this variable would be set in a shell starting `linuxcnc` or in a user's `~/.profile` startup script.
28212821
Example:
28222822

28232823
----

docs/src/gui/qtdragon.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ DISPLAY = qtvcp qtdragon
7272

7373
To keep track of preferences, QtDragon looks for a preference text file.
7474
Add the following entry under the `[DISPLAY]` heading. +
75-
It can use `~` for home directory or `WORKINGFOLDER` or `CONFIGFOLDER`
76-
to represent QtVCP's idea of those directories: +
75+
It can use `~` for home directory or `WORKINGFOLDER` or `CONFIGFOLDER` to represent QtVCP's idea of those directories: +
7776
This example will save the file in the config folder of the launch screen.
7877
(Other options are possible see the QtVCP's screenoption widget docs.)
7978

0 commit comments

Comments
 (0)