Skip to content

Commit 4f7ce41

Browse files
authored
Merge pull request #2409 from smoe/docs29_misc_17
While iterating through translations (smoe:docs29_misc_17)
2 parents 42fe45a + 7d5d6b1 commit 4f7ce41

12 files changed

Lines changed: 182 additions & 180 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ all age groups on automated machining.
5858
5959
Any machinery capable of harming persons must have
6060
provisions for completely removing power from all
61-
motors, etc, before persons enter any danger area.
61+
motors, etc., before persons enter any danger area.
6262
6363
All machinery must be designed to comply with local
6464
and national safety codes, and the authors of this

docs/src/config/ini-config.adoc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CORRECT = value
5959
=== Sections(((INI File,Components,Sections)))
6060

6161
Related parts of an INI file are separated into sections.
62-
A section name is enclosed in brackets like this `[THIS_SECTION]`.
62+
A section name is enclosed in brackets like this: `[THIS_SECTION]`.
6363
The order of sections is unimportant.
6464
Sections begin at the section name and end at the next section name.
6565

@@ -229,10 +229,10 @@ GMOCCAPY can be used both ways and offers also many connections for hardware con
229229
Descriptions of the interfaces are in the Interfaces section of the User Manual.
230230

231231
* `DISPLAY = axis` - The file name of the executable providing the user interface to use.
232-
Prominent valid options are (all in lower case): 'axis', 'touchy', 'gmoccapy', 'gscreen', 'tklinuxcnc', 'qtvcp', 'qtvcp-qtdragon' or 'qtvcp-qtplasmac'.
233-
* `POSITION_OFFSET = RELATIVE` - The coordinate system (RELATIVE or MACHINE) to show on the DRO when the user interface starts.
232+
Prominent valid options are (all in lower case): `axis`, `touchy`, `gmoccapy`, `gscreen`, `tklinuxcnc`, `qtvcp`, `qtvcp-qtdragon` or `qtvcp-qtplasmac`.
233+
* `POSITION_OFFSET = RELATIVE` - The coordinate system (`RELATIVE` or `MACHINE`) to show on the DRO when the user interface starts.
234234
The RELATIVE coordinate system reflects the G92 and G5__x__ coordinate offsets currently in effect.
235-
* `POSITION_FEEDBACK = COMMANDED` - The coordinate value (COMMANDED or ACTUAL) to show on the DRO when the user interface starts.
235+
* `POSITION_FEEDBACK = COMMANDED` - The coordinate value (`COMMANDED` or `ACTUAL`) to show on the DRO when the user interface starts.
236236
In AXIS this can be changed from the View menu.
237237
The COMMANDED position is the position requested by LinuxCNC.
238238
The ACTUAL position is the feedback position of the motors if they have feedback like most servo systems.
@@ -263,7 +263,7 @@ Descriptions of the interfaces are in the Interfaces section of the User Manual.
263263
* `DEFAULT_SPINDLE_0_SPEED = 100` - The default spindle RPM when the spindle is started in manual mode.
264264
On multi spindle machine there will be entries for each spindle number. Only used by the QtVCP-based user interfaces.
265265
- _deprecated_ - use the [SPINDLE_n] section instead.
266-
* `SPINDLE_INCREMENT = 200` - The increment used when clicking increase/decrease buttons Only used by the QtVCP based user interfaces.
266+
* `SPINDLE_INCREMENT = 200` - The increment used when clicking increase/decrease buttons. Only used by the QtVCP based user interfaces.
267267
- _deprecated_ - use the [SPINDLE_n] section instead.
268268
* `MIN_SPINDLE_0_SPEED = 1000` - The minimum RPM that can be manually selected.
269269
On multi spindle machine there will be entries for each spindle number. Only used by the QtVCP-based user interfaces.
@@ -317,17 +317,17 @@ See <<cha:gmoccapy,GMOCCAPY>> document for GMOCCAPY details.
317317
GMOCCAPY will not use this setting, as it offers a corresponding entry on its settings page.
318318
* `EDITOR = gedit` - The editor to use when selecting File > Edit to edit the G-code from the AXIS menu.
319319
This must be configured for this menu item to work.
320-
Another valid entry is gnome-terminal -e vim.
320+
Another valid entry is `gnome-terminal -e vim`.
321321
This entry does not apply to GMOCCAPY, as GMOCCAPY has an integrated editor.
322322
* `TOOL_EDITOR = tooledit` - The editor to use when editing the tool table
323323
(for example by selecting "File > Edit tool table..." in AXIS).
324-
Other valid entries are "gedit", "gnome-terminal -e vim", and "gvim".
324+
Other valid entries are `gedit`, `gnome-terminal -e vim`, and `gvim`.
325325
This entry does not apply to GMOCCAPY, as GMOCCAPY has an integrated editor.
326326
* `PYVCP = /filename.xml` - The PyVCP panel description file.
327327
See the <<cha:pyvcp,PyVCP Chapter>>for more information.
328328
* `PYVCP_POSITION = BOTTOM` - The placement of the PyVCP panel in the AXIS user interface.
329329
If this variable is omitted the panel will default to the right side.
330-
The only valid alternative is BOTTOM. See the <<cha:pyvcp,PyVCP Chapter>> for more information.
330+
The only valid alternative is `BOTTOM`. See the <<cha:pyvcp,PyVCP Chapter>> for more information.
331331
* `LATHE = 1` - Any non-empty value (including "0") causes axis to use "lathe mode" with a top view and with Radius and Diameter on the DRO.
332332
* `BACK_TOOL_LATHE = 1` - Any non-empty value (including "0") causes axis to use "back tool lathe mode" with inverted X axis.
333333
* `FOAM = 1` - Any non-empty value (including "0") causes axis to change the display for foam-cutter mode.
@@ -882,7 +882,7 @@ LinuxCNC will not know your joint travel limits when using `NO_FORCE_HOMING = 1`
882882
[[sub:ini:sec:axis-letter]]
883883
=== [AXIS_<letter>] Section(((INI File,Sections,[AXIS_<letter>] Sections)))
884884

885-
The <letter> specifies one of: X Y Z A B C U V W
885+
The _<letter>_ specifies one of: X Y Z A B C U V W
886886

887887
* `MAX_VELOCITY = 1.2` - Maximum velocity for this axis in <<sub:ini:sec:traj,machine units>> per second.
888888
* `MAX_ACCELERATION = 20.0` - Maximum acceleration for this axis in machine units per second squared.
@@ -896,7 +896,7 @@ The <letter> specifies one of: X Y Z A B C U V W
896896
For a rotary axis (A,B,C typ) with unlimited rotation having no `MAX_LIMIT` for that axis in the `[AXIS_`<letter>`]` section a value of 1e99 is used.
897897
* `WRAPPED_ROTARY = 1` - When this is set to 1 for an ANGULAR axis the axis will move 0-359.999 degrees.
898898
Positive Numbers will move the axis in a positive direction and negative numbers will move the axis in the negative direction.
899-
* `LOCKING_INDEXER_JOINT = 4` - This value selects a joint to use for a locking indexer for the specified axis <letter>.
899+
* `LOCKING_INDEXER_JOINT = 4` - This value selects a joint to use for a locking indexer for the specified axis _<letter>_.
900900
In this example, the joint is 4 which would correspond to the B axis for a XYZAB system with trivkins (identity) kinematics.
901901
When set, a G0 move for this axis will initiate an unlock with the `joint.4.unlock pin` then wait for the `joint.4.is-unlocked` pin then move the joint at the rapid rate for that joint.
902902
After the move the `joint.4.unlock` will be false and motion will wait for `joint.4.is-unlocked` to go false.
@@ -950,12 +950,12 @@ For example, using trivkins with `coordinates=XZ`, the joint-axes relationships
950950
* JOINT_0 = X
951951
* JOINT_1 = Z
952952

953-
For more information on kinematics modules see the manpage: `$ man kins`
953+
For more information on kinematics modules see the manpage 'kins' (on the UNIX terminal type `man kins`).
954954

955955
* `TYPE = LINEAR` - The type of joint, either `LINEAR` or `ANGULAR`.
956956
* `UNITS = INCH` - (((UNITS)))
957-
If specified, this setting overrides the related `[TRAJ] UNITS` setting.
958-
(e.g., `[TRAJ]LINEAR_UNITS` if the `TYPE` of this joint is `LINEAR`, `[TRAJ]ANGULAR_UNITS` if the `TYPE` of this joint is `ANGULAR`)
957+
If specified, this setting overrides the related `[TRAJ] UNITS` setting,
958+
e.g., `[TRAJ]LINEAR_UNITS` if the `TYPE` of this joint is `LINEAR`, `[TRAJ]ANGULAR_UNITS` if the `TYPE` of this joint is `ANGULAR`.
959959
* `MAX_VELOCITY = 1.2` - Maximum velocity for this joint in <<sub:ini:sec:traj,machine units>> per second.
960960
* `MAX_ACCELERATION = 20.0` - Maximum acceleration for this joint in machine units per second squared.
961961
* `BACKLASH = 0.0000` - (((Backlash))) Backlash in machine units.
@@ -1067,15 +1067,15 @@ These parameters are Homing related, for a better explanation read the <<cha:hom
10671067
When it is yes, it will affect the kind of home pattern used.
10681068
Currently, you can't home to index with steppers unless you're using StepGen in velocity mode and PID.
10691069
* `HOME_INDEX_NO_ENCODER_RESET = NO` -
1070-
Use YES if the encoder used for this joint does not reset its counter when an index pulse is detected after assertion of the joint index_enable HAL pin.
1070+
Use YES if the encoder used for this joint does not reset its counter when an index pulse is detected after assertion of the joint `index_enable` HAL pin.
10711071
Applicable only for `HOME_USE_INDEX = YES`.
10721072
* `HOME_IGNORE_LIMITS = NO` -
10731073
When you use the limit switch as a home switch and the limit switch this should be set to YES.
10741074
When set to YES the limit switch for this joint is ignored when homing.
10751075
You must configure your homing so that at the end of your home move the home/limit switch is not in the toggled state you will get a limit switch error after the home move.
10761076
* `HOME_IS_SHARED =` _<n>_ -
1077-
If the home input is shared by more than one joint set <n> to 1 to prevent homing from starting if the one of the shared switches is already closed.
1078-
Set <n> to 0 to permit homing if a switch is closed.
1077+
If the home input is shared by more than one joint set _<n>_ to 1 to prevent homing from starting if the one of the shared switches is already closed.
1078+
Set _<n>_ to 0 to permit homing if a switch is closed.
10791079
* `HOME_ABSOLUTE_ENCODER = 0` | `1` | `2` - Used to indicate the joint uses an absolute encoder.
10801080
At a request for homing, the current joint value is set to the `HOME_OFFSET` value.
10811081
If the `HOME_ABSOLUTE_ENCODER` setting is 1, the machine makes the usual final move to the `HOME` value.
@@ -1332,7 +1332,7 @@ The value of _num_spindles_ is set by `[TRAJ]SPINDLES=` .
13321332
There is usually no need to change this number.
13331333
* `TOOL_TABLE = tool.tbl` - The file which contains tool information, described in the User Manual.
13341334
* `DB_PROGRAM = db_program` - Path to an executable program that manages tool data.
1335-
(When a DB_PROGRAM is specified, a TOOL_TABLE entry is ignored)
1335+
When a DB_PROGRAM is specified, a TOOL_TABLE entry is ignored.
13361336
* `TOOL_CHANGE_POSITION = 0 0 2` -
13371337
Specifies the XYZ location to move to when performing a tool change if three digits are used.
13381338
Specifies the XYZABC location when 6 digits are used.

docs/src/config/stepper.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ standard_pinout.hal gets executed/interpreted:
174174
* The Parport driver gets loaded (see the <<cha:parport,Parport Chapter>> for details).
175175
* The read & write functions of the parport driver get assigned to the
176176
base thread footnote:[the fastest thread in the LinuxCNC setup, usually ther
177-
code gets executed every few tens of microseconds].
177+
code gets executed every few tens of microseconds.].
178178
* The step & direction signals for axes X, Y, Z get linked to pins on the
179179
parport.
180180
* Further I/O signals get connected (estop loopback, toolchanger loopback).

docs/src/gui/qtdragon.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ qtdragon.spindle-volts
448448
----
449449

450450
This bit pin is an output to the spindle control to pause it. +
451-
You would connect it to spindle.0.inhibit.
451+
You would connect it to `spindle.0.inhibit`.
452452

453453
[source,{hal}]
454454
----

docs/src/gui/qtvcp-widgets.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,20 +2919,20 @@ NGCGUI_SUBFILE = qpocket.ngc
29192919
==== Buttons
29202920

29212921
* 'NEW TAB' -adds a new blank tab to ngcgui
2922-
* 'SELECT PREAMBLE' -select a file that add preamble gcode
2922+
* 'SELECT PREAMBLE' -select a file that add preamble G-code
29232923
* 'SELECT SUBFILE' -select a ngcgui subroutine file
2924-
* 'SELECT POST' -select a file that add post gcode
2924+
* 'SELECT POST' -select a file that add post G-code
29252925
* 'REREAD FILE' -reload the subroutine file
29262926
* 'CREATE FEATURE' -add feature to the list
29272927
* 'RESTART FEATURE' - remove all features from the list
2928-
* 'FINALIZE GCODE' -create the full gcode and send it to linuxcnc/a file
2928+
* 'FINALIZE GCODE' -create the full G-code and send it to LinuxCNC/a file
29292929

29302930
==== Adding Custom Subroutines
29312931
You can create your own subroutines for use with ngcgui. +
29322932
they must follow these rules:
29332933

29342934
* For creating a subroutine for use with NGCGUI, the filename and the subroutine name must be the same.
2935-
* The subroutine must be in a folder within linuxcnc's INI designated search path
2935+
* The subroutine must be in a folder within LinuxCNC's INI designated search path.
29362936
* On the first line there may be a comment of type info:
29372937
* The subroutine must be surrounded by the sub and endsub tags.
29382938
* The variables used must be numbered variables and must not skip number.

docs/src/gui/qtvcp.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ combines this with _Python programming_ to create a GUI screen for
1919
running a CNC machine.
2020

2121
QtVCP is completely _customizable_: you can add different buttons and
22-
status LEDs etc. or add python code for even finer grain customization.
22+
status LEDs etc. or add Python code for even finer grain customization.
2323

2424
== Showcase
2525

@@ -209,9 +209,9 @@ QtVCP can also be customized with _Qt stylesheets (QSS)_ using CSS.
209209

210210
=== Local Files
211211

212-
If present, local UI/QSS/python files in the configuration folder will be loaded instead of the stock UI files.
212+
If present, local UI/QSS/Python files in the configuration folder will be loaded instead of the stock UI files.
213213

214-
Local UI/QSS/python files allow you to use your customized designs rather than the default screens.
214+
Local UI/QSS/Python files allow you to use your customized designs rather than the default screens.
215215

216216
QtVCP will look for a folder named <screen_name> (in the launched configuration folder that holds the INI file).
217217

docs/src/hal/basic-hal.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ net signal-name pin-name <optional arrow> <optional second pin-name>
139139
net home-x joint.0.home-sw-in <= parport.0.pin-11-in
140140
----
141141

142-
In the above example 'home-x' is the signal name, 'joint.0.home-sw-in' is a 'Direction IN' pin, '<=' is the optional direction arrow, and 'parport.0.pin-11-in' is a 'Direction OUT' pin.
142+
In the above example `home-x` is the signal name, `joint.0.home-sw-in` is a 'Direction IN' pin, `<=` is the optional direction arrow, and `parport.0.pin-11-in` is a 'Direction OUT' pin.
143143
This may seem confusing but the in and out labels for a parallel port pin indicates the physical way the pin works not how it is handled in HAL.
144144

145145
A pin can be connected to a signal if it obeys the following rules:
@@ -234,7 +234,7 @@ These commands are included so older configurations will still work.
234234

235235
==== linksp (deprecated)
236236

237-
The command 'linksp' creates a 'connection' between a signal and one pin.
237+
The command `linksp` creates a 'connection' between a signal and one pin.
238238

239239
.linksp Syntax and Example
240240
[source,{hal}]
@@ -243,12 +243,12 @@ linksp <signal-name> <pin-name>
243243
linksp X-step parport.0.pin-02-out
244244
----
245245

246-
*The 'linksp' command has been superseded by the 'net' command.*
246+
*The `linksp` command has been superseded by the `net` command.*
247247

248248
==== linkps (deprecated)
249249

250250
The command `linkps` creates a 'connection' between one pin and one signal.
251-
It is the same as linksp but the arguments are reversed.
251+
It is the same as `linksp` but the arguments are reversed.
252252

253253
.linkps Syntax and Example
254254
[source,{hal}]
@@ -520,7 +520,7 @@ Which updates the `weighted_sum` component.
520520
In the following example, a copy of the AXIS HAL configuration window, bits '0' and '2' are TRUE, they have no offset.
521521
The weight ('weight') of bit 0 is 1, that of bit 2 is 4, so the sum is 5.
522522

523-
.`weighted_sum` Example component Pin for weighted sum.s
523+
.`weighted_sum` Example component Pin for weighted sums.
524524
[width="90%",options="header"]
525525
|===
526526
|Owner|Type |Dir |Value |Name

docs/src/hal/haltcl.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ Because INI files can repeat the same ITEM in the same SECTION multiple times, `
108108
When there is just one value and it is a simple value (all values that are just letters and numbers without whitespace are in this group),
109109
then it is possible to treat `$::SECTION(ITEM)` as though it is not a list.
110110

111-
When the value could contain special characters--quote characters, curly-brace characters, embedded whitespace, and other characters that have special meaning in Tcl.
112-
It is necessary to distinguish between the list of values and the initial (and possibly only) value in the list.
111+
When the value could contain special characters (quote characters, curly-brace characters, embedded whitespace, and other characters that have special meaning in Tcl)
112+
then it is necessary to distinguish between the list of values and the initial (and possibly only) value in the list.
113113

114114
In Tcl, this is written `[lindex $::SECTION(ITEM) 0]`.
115115

@@ -197,7 +197,7 @@ MAXACCEL = 10.0
197197
STEPGEN_MAXACCEL = 10.5
198198
----
199199

200-
With `haltcl`, you can use Tcl commands to do the computation and eliminate the STEPGEN_MAXACCEL INI file item altogether:
200+
With `haltcl`, you can use Tcl commands to do the computation and eliminate the `STEPGEN_MAXACCEL` INI file item altogether:
201201

202202
[source,tcl]
203203
----

0 commit comments

Comments
 (0)