Skip to content

Commit 61b25c6

Browse files
authored
Merge pull request #2797 from smoe/docs_translations_mix_01
presumed smallish corrections for the documentation smoe/docs_translations_mix_01
2 parents e7352ac + 750490d commit 61b25c6

7 files changed

Lines changed: 35 additions & 35 deletions

File tree

docs/README.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ generating translated files using the files in docs/po/.
2121

2222
== Notes on LinuxCNC documentation
2323

24-
The main LinuxCNC makefile can optionally build the documentation and
24+
The main LinuxCNC Makefile can optionally build the documentation and
2525
other files in this directory tree. Use "--enable-build-documentation"
2626
when invoking src/configure, and run "make" from src.
2727

@@ -40,11 +40,11 @@ which is available for many systems, see link:https://repology.org/project/qcad/
4040
Unfortunately, EasyCAD (and AutoCAD) support a number of entities
4141
that QCAD does not import properly. Including some that were used
4242
in the LinuxCNC drawings: filled circles, filled arrowheads, non-zero
43-
width lines, and dashed lines. Qcad renders filled circles as
43+
width lines, and dashed lines. QCAD renders filled circles as
4444
hollow, it renders all lines the same width, and it renders dashed
4545
lines as solid, unless you tell it to do otherwise. All of these
4646
things make the drawings less attractive, but are somewhat
47-
acceptable. However, Qcad doesn't import filled arrowheads at all,
47+
acceptable. However, QCAD doesn't import filled arrowheads at all,
4848
which seriously hurts the drawings. So EasyCad was used to convert
4949
the arrowheads to hollow before exporting them. Hollow arrowheads
5050
don't look as nice as solid ones, but at least they are visible.
@@ -53,7 +53,7 @@ Once exported, the arrowheads lose their relationship with the line they
5353
are on, and need to be moved and/or rotated manually if the line is
5454
moved. I believe that even if they were imported back into EasyCad, the
5555
line/arrow connection would remain broken. New lines with arrowheads can
56-
be created in Qcad with the 'leader' dimension tool.
56+
be created in QCAD with the 'leader' dimension tool.
5757

5858
Because the original EPS files with filled lines and circles, wide lines,
5959
and dashed lines look so much nicer, they will remain in Git and should

docs/src/drivers/hal_gpio.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ gpiochip0 - 54 lines:
5252
...
5353
----
5454

55-
A list of input and/or output pins should be specified as shown in the sample above. (the \ character is used for line continuation in HAL, and is used to improve readability. The pin names are case-sensitive and there must be no spaces in the strings, either beteen the comma-separated pins lists of the "=" signs.
55+
A list of input and/or output pins should be specified as shown in the sample above. (The \ character is used for line continuation in HAL, and is used to improve readability. The pin names are case-sensitive and there must be no spaces in the strings, either beteen the comma-separated pins lists of the "=" signs.)
5656

5757
Additional modifiers are:
5858
*invert* (valid for outputs only). Inverts the sense of the physical pin relative to the value in HAL.
5959

6060
*reset* (valid for outputs only). If any pins are allocated to the "reset" list than a HAL parameter *hal_gpio.reset_ns* will be created. This will have no effect unless the *hal_gpio.reset* function is added to a realtime thread. This should be placed after the *hal_gpio.write* function and must be in the same thread. The behaviour of this function is equivalent to the same function in the *hal_parport* driver, and it allows a step pulse every thread cycle. If the *hal_gpio.reset_ns* time is set longer than 1/4 of the period of the thread that it is added to, then the value will be reduced to 1/4 the thread period. There is a lower limit to how long the pulse can be. With 8 pins in the output list the pulse width can not reduce lower than 5000ns on a Pi4, for example.
6161

6262
The following functions are accepted in all versions, but are only effective if a version of libgpiod_dev >= 1.6 is installed.
63-
They should be used in the same way as the parameters described above, and will alter the electrical paramters of the GPIO pins *if* this is supported by the hardware.
63+
They should be used in the same way as the parameters described above, and will alter the electrical parameters of the GPIO pins *if* this is supported by the hardware.
6464

6565
*opendrain*
6666

docs/src/gcode/g-code.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,8 +1709,8 @@ It is an error if:
17091709
== G71 G72 Lathe roughing cycles(((G71 G72 Lathe roughing cycles)))
17101710

17111711
[NOTE]
1712-
The G71 and G72 cycles are currently somewhat fragile. See issues #707
1713-
and #1146
1712+
The G71 and G72 cycles are currently somewhat fragile.
1713+
See issues https://github.com/LinuxCNC/linuxcnc/issues/707[#707] and https://github.com/LinuxCNC/linuxcnc/issues/1146[#1146].
17141714

17151715
[source,{ngc}]
17161716
----

docs/src/gui/qtdragon.adoc

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ Sequence after pressing the probe button: +
829829
. probe wall twice (rough and fine),
830830
. move diagonally to the other wall as set by EDGE WIDTH and XY CLEARANCE,
831831
. probe wall twice,
832-
. raise probe up by Z CLEARANCE + EXTRA DEPTH 9returns to starting height),
832+
. raise probe up by Z CLEARANCE + EXTRA DEPTH (returns to starting height),
833833
. rapid back to starting corner (now calculated using the probed walls),
834834
. if auto zero button is enabled, set X and Y of the current user system to zero.
835835

@@ -898,10 +898,10 @@ The sequence of events (using the default files):
898898
* Return Z to position defined in the INI's [TOOL_CHANGE] Z
899899

900900
[NOTE]
901-
The [TOOL_CHANGE] Z position should be high enough so the tool will not hit the tool probe
901+
The [TOOL_CHANGE] Z position should be high enough so the tool will not hit the tool probe
902902
when moving to the [VERSA_TOOLSETTER] X and Y position.
903903
MAXPROBE distance needs to be high enough for the tool to touch the probe.
904-
904+
905905
=== Work Piece Height Probing
906906

907907
.QtDragon_hd - Work piece Height probing
@@ -987,7 +987,7 @@ USE_PROBE = basicprobe
987987
<<sub:remap:sec:error-handling, Remap Abort Details>>
988988

989989
[NOTE]
990-
These default entries should work fine in most situations. Some systems may need to use 'linuxcnc/nc_files/examples/'
990+
These default entries should work fine in most situations. Some systems may need to use 'linuxcnc/nc_files/examples/'
991991
instead of 'linuxcnc/nc_files/'. please check that paths are valid. Custom entries pointing to modified file are possible.
992992

993993
[source,{ini}]
@@ -1058,11 +1058,12 @@ Z = -2
10581058
==== The Python Section
10591059

10601060
The Python section sets up what files LinuxCNC's Python interpreter looks for, e.g., `toplevel.py` file in the `python` folder in the configuration directory:
1061-
These default entries should work fine in most situations. Some systems may need to use 'linuxcnc/nc_files/examples/'
1062-
instead of 'linuxcnc/nc_files/'. Custom entries pointing to modified file are possible.
1061+
These default entries should work fine in most situations. Some systems may need to use 'linuxcnc/nc_files/examples/' instead of 'linuxcnc/nc_files/'.
1062+
Custom entries pointing to modified file are possible.
1063+
10631064
[source,{ini}]
10641065
----
1065-
# The path start point for all remap searches ie. python's sys.path.append()
1066+
# The path start point for all remap searches, i.e. Python's sys.path.append()
10661067
PATH_APPEND = ~/linuxcnc/nc_files/remap_lib/python-stdglue/python
10671068
# path to the tremap's 'toplevel file
10681069
TOPLEVEL = ~/linuxcnc/nc_files/remap_lib/python-stdglue/python/toplevel.py
@@ -1175,14 +1176,14 @@ You can also write your own HTML docs with the included SetUp Writer button. +
11751176
There are three sub tabs:
11761177

11771178
* 'HTML' - any loaded HTML pages are displayed here. The navigation buttons work on this page.
1178-
* 'PDF' - any loaded PDF setup pages are displayed here
1179-
* 'PROPERTIES' - when a program is loaded its gcode properties are displayed here.
1179+
* 'PDF' - any loaded PDF setup pages are displayed here.
1180+
* 'PROPERTIES' - when a program is loaded its G-code properties are displayed here.
11801181

11811182
There are navigation buttons for HTML page:
11821183

1183-
* The up arrow returns you to the default HTML page
1184-
* The left arrow moves backward one HTML page
1185-
* The right arrow moves forward one HTML page
1184+
* The up arrow returns you to the default HTML page.
1185+
* The left arrow moves backward one HTML page.
1186+
* The right arrow moves forward one HTML page.
11861187

11871188
If you wish to include a custom default HTML page, name it 'default_setup.html' and place it in your configuration folder. +
11881189
Custom QtVCP panels can be displayed in this tab by setting the EMBED_TAB_LOCATION option to 'tabWidget_setup'.
@@ -1198,7 +1199,7 @@ The settings tab is used to set running options, probing/touchplate/laser/camera
11981199

11991200
This tabs will display another stab election of G-code utility programs:
12001201

1201-
* 'Facing': allows quick face milling of a definable area at angles of 0,45 and 90 degrees
1202+
* 'Facing': allows quick face milling of a definable area at angles of 0,45 and 90 degrees.
12021203
* 'Hole Circle': allows quick setting of a program to drill a bolt circle of definable diameter and number of holes.
12031204
* 'NGCGUI': is a QtVCP version of the popular G-code subroutine builder/selector, see <<sub:qtvcp:widgets:qt-ngcgui,Widgets-NGCGUI>>.
12041205

docs/src/gui/qtvcp-widgets.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,10 +2722,10 @@ self.w.joypadename.setProperty('false_color','red')
27222722
----
27232723

27242724
=== 'WebWidget'
2725-
This widget will create a html/pdf viewing page using the QtWebKit or
2726-
QtWebEngine libraries. The newer QtWebEngine is preferred if both are on the system. +
2727-
If the QtWebEngine library is used with the QtDesigner editor, a placeholder QWidget will show in Qesigner.
2728-
This will be replaced with thw QtWebEngine widget at run time.
2725+
This widget will create a html/pdf viewing page using the QtWebKit or QtWebEngine libraries.
2726+
The newer QtWebEngine is preferred if both are on the system. +
2727+
If the QtWebEngine library is used with the Qt Designer editor, a placeholder QWidget will show in Qesigner.
2728+
This will be replaced with the QtWebEngine widget at run time.
27292729

27302730
[[sec:qtvcp:widgets:baseclass-mixin]]
27312731
== BaseClass/Mixin Widgets

docs/src/gui/qtvcp.adoc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,12 @@ Here we show how to add new functions and override existing ones.
277277
# reference: https://ruivieira.dev/python-monkey-patching-for-readability.html
278278
import types
279279
280-
# import the handlerfile to get reference to it's libraries.
280+
# import the handlerfile to get reference to its libraries.
281281
# use <screenname>_handler
282282
import qtdragon_handler as hdlr
283283
284284
# This is actually an unbounded function with 'obj' as a parameter.
285-
# You call this function without the usual preceding 'self.'
285+
# You call this function without the usual preceding 'self.'.
286286
# This is because will will not be patching it into the original handler class instance
287287
# It will only be called from code in this file.
288288
def test_function(obj):
@@ -329,18 +329,17 @@ self.on_keycall_F11 = types.MethodType(on_keycall_F11, self)
329329
def new_pin_changed(data):
330330
print(data)
331331
332-
# special function that gets called before the HAL component is set ready
333-
# here we used the function to add a bit input pin with a callback
332+
# Special function that gets called before the HAL component is set ready.
333+
# Here we used the function to add a bit input pin with a callback.
334334
def after_override__(self):
335335
try:
336336
pin = hdlr.QHAL.newpin("new_pin", hdlr.QHAL.HAL_BIT, hdlr.QHAL.HAL_IN)
337337
pin.value_changed.connect(new_pin_changed)
338338
except Exception as e:
339339
print(e)
340340
341-
# Here we are instance patching the original handler file to add a new
342-
# function that calls our new function (of the same name)
343-
# defined in this file
341+
# Here we are instance patching the original handler file to add a new function
342+
# that calls our new function (of the same name) defined in this file.
344343
self.after_override__ = types.MethodType(after_override__, self)
345344
346345
----
@@ -941,7 +940,7 @@ If QtVCP finds these it will call them, if not it will silently ignore them.
941940
before the optional HAL file is loaded or HAL component is set ready.
942941

943942
*`processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl):`*::
944-
This function is called to facilitate _keyboard jogging_ etc. +
943+
This function is called to facilitate _keyboard jogging_, etc. +
945944
By using the _`keybinding` library_ this can be used to easily add functions bound to keypresses.
946945

947946
*`keypress_event__(self,receiver, event):`*::

docs/src/plasma/qtplasmac.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,8 +3189,8 @@ self.old_method_name = new_method_name
31893189
----
31903190

31913191
[NOTE]
3192-
The existing filter code may be observed in the file /bin/qtplasmac_gcode +
3193-
The file sim/qtplasmac/custom_filter.py has example skeleton code for custom filtering
3192+
The existing filter code may be observed in the file /bin/qtplasmac_gcode. +
3193+
The file sim/qtplasmac/custom_filter.py has example skeleton code for custom filtering.
31943194

31953195
== QtPlasmaC Advanced Topics
31963196

0 commit comments

Comments
 (0)