Skip to content

Commit 34ae00d

Browse files
authored
Merge pull request #1880 from smoe/atom-edited-changes-during-translations
Atom edited changes during translations
2 parents 6fbd956 + f5f703c commit 34ae00d

File tree

8 files changed

+103
-102
lines changed

8 files changed

+103
-102
lines changed

docs/src/gcode/coordinates.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ By default, 'G92' offsets are restored after the machine is started.
304304
Programmers that wish for Fanuc behavior, where 'G92' offsets are
305305
cleared at machine start and after a reset or program end, may disable
306306
'G92' persistence by setting 'DISABLE_G92_PERSISTENCE = 1' in the
307-
'[RS274NGC]' section of the '.ini' file.
307+
'[RS274NGC]' section of the INI file.
308308

309309
[NOTE]
310310
It is good practice to clear the 'G92' offsets at the end of their use
@@ -318,7 +318,7 @@ will be applied when an axis is homed. See
318318
There are at least two ways to set G92 values:
319319

320320
* With a right click on the position displays in tklinuxcnc, a window opens
321-
where it is possible to enter a value
321+
where it is possible to enter a value.
322322
* With the G92 command
323323

324324
Both work from the current position of the axis that should be moved.
@@ -384,13 +384,13 @@ effect a startup will cause them to become active again. As a
384384
safeguard, always have your preamble to set the environment as you
385385
expect it. Additionally, 'G92' persistence may be disabled by setting
386386
'DISABLE_G92_PERSISTENCE = 1' in the '[RS274NGC]' section of the
387-
'.ini' file.
387+
INI file.
388388

389389
[[sec:g92-g52-interaction-cautions]]
390390
=== G92 and G52 Interaction Cautions
391391

392392
'G52' and 'G92' share the same offset registers. Unless 'G92'
393-
persistence is disabled in the '.ini' file(see
393+
persistence is disabled in the INI file (see
394394
<<sec:g92-commands,G92 Commands>>),
395395
'G52' offsets will also persist after machine reset,
396396
'M02' or 'M30'. Beware that a 'G52' offset in effect during a program

docs/src/gcode/g-code.adoc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ M2 (end program)
162162

163163
If cutter compensation is active, the motion will differ from
164164
the above; see the <<sec:cutter-radius-compensation,Cutter Compensation>>
165-
Section.
165+
section.
166166

167167
If 'G53' is programmed on the same line, the motion will also differ;
168-
see the <<gcode:g53,G53>> Section for more information.
168+
see the <<gcode:g53,G53>> section for more information.
169169

170170
The path of a G0 rapid motion can be rounded at direction changes and
171171
depends on the <<sec:trajectory-control,trajectory control>> settings
@@ -212,10 +212,10 @@ M2 (end program)
212212

213213
If cutter compensation is active, the motion will differ from
214214
the above; see the <<sec:cutter-radius-compensation,Cutter Compensation>>
215-
Section.
215+
section.
216216

217217
If 'G53' is programmed on the same line, the motion will also differ;
218-
see the <<gcode:g53,G53>> Section for more information.
218+
see the <<gcode:g53,G53>> section for more information.
219219

220220
It is an error if:
221221

@@ -963,8 +963,8 @@ The UV, WU and VW planes do not support arcs.
963963
It is a good idea to include a plane selection in the preamble
964964
of each G-code file.
965965

966-
The effects of having a plane selected are discussed in Section
967-
<<gcode:g2-g3,G2 G3 Arcs>> and Section <<gcode:g80-g89,G81 G89>>.
966+
The effects of having a plane selected are discussed in section
967+
<<gcode:g2-g3,G2 G3 Arcs>> and section <<gcode:g80-g89,G81 G89>>.
968968

969969
[[gcode:g20-g21]]
970970
== G20, G21 Units(((G20 Units)))
@@ -1262,7 +1262,7 @@ A comment of the form '(PROBEOPEN filename.txt)' will open
12621262
'filename.txt' and store the 9-number coordinate consisting of
12631263
XYZABCUVW of each successful straight probe in it.
12641264
The file must be closed with '(PROBECLOSE)'. For more information
1265-
see the <<gcode:comments,Comments>> Section.
1265+
see the <<gcode:comments,Comments>> section.
12661266

12671267
An example file 'smartprobe.ngc' is included (in the examples directory)
12681268
to demonstrate using probe moves to log to a file the coordinates of a
@@ -1349,7 +1349,7 @@ User M100-M199 commands are allowed when Cutter Compensation is on.
13491349

13501350
The behavior of the machining center when cutter compensation
13511351
is on is described in the <<sec:cutter-radius-compensation,Cutter Compensation>>
1352-
Section along with code examples.
1352+
section along with code examples.
13531353

13541354
It is an error if:
13551355

@@ -1390,7 +1390,7 @@ G43 <H->
13901390

13911391
* 'H' - tool number (optional)
13921392

1393-
* 'G43' - enables tool length compensation.
1393+
* 'G43' - enables tool length compensation.
13941394
G43 changes subsequent motions by offsetting the axis coordinates by
13951395
the length of the offset. G43 does not cause any motion. The next time
13961396
a compensated axis is moved, that axis's endpoint is the compensated
@@ -1497,10 +1497,10 @@ location.
14971497

14981498
It is an error if:
14991499

1500-
* 'H' is unspecified and no axis offsets are specified
1501-
* 'H is specified and the given tool number does not exist in the tool
1502-
table
1503-
* 'H' is specified and axes are also specified
1500+
* 'H' is unspecified and no axis offsets are specified.
1501+
* 'H' is specified and the given tool number does not exist in the tool
1502+
table.
1503+
* 'H' is specified and axes are also specified.
15041504

15051505
NOTE: G43.2 does not write to the tool table.
15061506

@@ -1590,7 +1590,7 @@ It is an error if:
15901590

15911591
* selecting a coordinate system is used while cutter compensation is on.
15921592

1593-
See the <<cha:coordinate-system,Coordinate System>> Section for an
1593+
See the <<cha:coordinate-system,Coordinate System>> section for an
15941594
overview of coordinate systems.
15951595

15961596
[[gcode:g61]]
@@ -1637,7 +1637,7 @@ G64 <P- <Q->>
16371637
arc-line cases as well as line-line benefit from the 'naive cam
16381638
detector'. This improves contouring performance by simplifying the
16391639
path. It is OK to program for the mode that is already active. See
1640-
also the <<sec:trajectory-control,Trajectory Control>> Section for
1640+
also the <<sec:trajectory-control,Trajectory Control>> section for
16411641
more information on these modes.
16421642
If Q is not specified then it will have the same behavior as before
16431643
and use the value of P-.
@@ -2029,7 +2029,7 @@ The height of the retract move at the end of each repeat (called
20292029
'clear Z' in the descriptions below) is determined by the setting of
20302030
the retract mode, either to the original Z position (if that is above
20312031
the R position and the retract mode is 'G98', OLD_Z), or otherwise to
2032-
the R position. See the <<gcode:g98-g99,G98 G99>> Section.
2032+
the R position. See the <<gcode:g98-g99,G98 G99>> section.
20332033

20342034
[[gcode:canned-cycle-errors]]
20352035
=== Canned Cycle Errors(((Canned Cycle Errors)))
@@ -2066,7 +2066,7 @@ In addition, at the beginning of the first cycle and each repeat, the
20662066
following one or two moves are made
20672067

20682068
* A <<gcode:g0,rapid move>> parallel to the XY-plane to
2069-
the given XY-position,
2069+
the given XY-position.
20702070
* The Z-axis make a rapid move to the R position, if it is
20712071
not already at the R position.
20722072

@@ -2198,7 +2198,7 @@ N240 M2 (program end)
21982198
----
21992199

22002200
[NOTE]
2201-
Notice the z position change after the first four holes.
2201+
Notice the Z position change after the first four holes.
22022202
Also, this is one of the few places where line numbers have some value,
22032203
being able to point a reader to a specific line of code.
22042204

@@ -2279,7 +2279,7 @@ The first preliminary move is a maximum rapid move along the Z axis to
22792279
The first repeat consists of 3 moves.
22802280

22812281
* A <<gcode:g0,rapid move>> parallel to the XY-plane to (X5, Y7)
2282-
* Move parallel to the Z-axis at the <<sec:set-feed-rate,feed rate>> to
2282+
* Move parallel to the Z-axis at the <<sec:set-feed-rate,feed rate>> to
22832283
(Z4.2)
22842284
* A rapid move parallel to the Z-axis to (X5, Y7, Z4.8)
22852285

@@ -2601,13 +2601,13 @@ program a G92.2 (to remove them - they are still stored).
26012601

26022602
[NOTE]
26032603
The 'G52' command can also be used to change this offset; see the
2604-
<<sec:g52-and-g92-offsets,Offsets>> Section for more details about
2604+
<<sec:g52-and-g92-offsets,Offsets>> section for more details about
26052605
'G92' and 'G52' and how they interact.
26062606

2607-
See the <<cha:coordinate-system,Coordinate System>> Section for an
2607+
See the <<cha:coordinate-system,Coordinate System>> section for an
26082608
overview of coordinate systems.
26092609

2610-
See the <<sec:overview-parameters,Parameters>> Section for more
2610+
See the <<sec:overview-parameters,Parameters>> section for more
26112611
information.
26122612

26132613
[[gcode:g92.1-g92.2]]

docs/src/gcode/m-code.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ M5 $2
132132
----
133133

134134
If the $ is omitted then behaviour is exactly as normal for a single
135-
spindle machine
135+
spindle machine.
136136

137137
It is OK to use 'M3' or 'M4' if the <<sec:set-spindle-speed,S>>
138138
spindle speed is set to zero. If this is done

docs/src/gcode/machining-center.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ directions.
7474
=== Coolant(((coolant)))
7575

7676
Flood coolant and mist coolant may each be turned on independently.
77-
The RS274/NGC language turns them off together see Section
77+
The RS274/NGC language turns them off together see section
7878
<<mcode:m7-m8-m9,M7 M8 M9>>.
7979

8080
=== Feed and Speed Override(((feed override)))(((spindle override)))
@@ -86,13 +86,13 @@ speed used in machining at some percentage of the programmed rate.
8686
=== Block Delete Switch
8787

8888
A CNC machine can have a block delete switch.
89-
See the <<sub:block-delete-switch,Block Delete>> Section.
89+
See the <<sub:block-delete-switch,Block Delete>> section.
9090

9191
[[sub:optional-program-stop-switch]]
9292
=== Optional Program Stop Switch
9393

9494
A CNC machine can have an optional program stop switch.
95-
See the <<sub:optional-program-stop,Optional Program Stop>> Section.
95+
See the <<sub:optional-program-stop,Optional Program Stop>> section.
9696

9797
== Control and Data Components
9898

@@ -171,7 +171,7 @@ rate unobtainable, all axes are slowed to maintain the desired path.
171171
The rate at which the controlled point moves is nominally a steady
172172
rate which may be set by the user. In the Interpreter, the feed
173173
rate is interpreted as follows (unless 'inverse time feed' or 'feed
174-
per revolution' modes are being used, in which case see Section
174+
per revolution' modes are being used, in which case see section
175175
<<gcode:g93-g94-g95,G93-G94-G95-Mode,G93 G94 G95>>).
176176

177177
. If any of XYZ are moving, F is in units per minute in the XYZ
@@ -194,7 +194,7 @@ See section about <<mcode:m7-m8-m9,cooling control>>.
194194
A machining center may be commanded to dwell (i.e., keep all axes
195195
unmoving) for a specific amount of time. The most common use of dwell
196196
is to break and clear chips, so the spindle is usually turning during a
197-
dwell. Regardless of the Path Control Mode (see Section
197+
dwell. Regardless of the Path Control Mode (see section
198198
<<sec:path-control-mode,Path Control>>) the machine will stop exactly at the end of
199199
the previous programmed move, as though it was in exact path mode.
200200

@@ -206,7 +206,7 @@ machine control cannot be changed. Different quantities use different
206206
specific units. Spindle speed is measured in revolutions per minute.
207207
The positions of rotational axes are measured in degrees. Feed rates
208208
are expressed in current length units per minute, or degrees per
209-
minute, or length units per spindle revolution, as described in Section
209+
minute, or length units per spindle revolution, as described in section
210210
<<gcode:g93-g94-g95,G93 G94 G95>>.
211211

212212
=== Current Position
@@ -254,19 +254,19 @@ See also <<sec:speed-interaction,here for further details>>.
254254
The machining center may be put into any one of three path control
255255
modes:
256256

257-
* exact stop mode::
257+
exact stop mode::
258258
In exact stop mode, the machine stops briefly at the end of each
259259
programmed move.
260-
* exact path mode::
260+
exact path mode::
261261
In exact path mode, the machine follows the programmed path as exactly
262262
as possible, slowing or stopping if necessary at sharp corners of
263263
the path.
264-
* continuous mode::
264+
continuous mode::
265265
In continuous mode, sharp corners of the path may be rounded slightly
266266
so that the feed rate may be kept up (but by no more than the tolerance,
267267
if specified).
268268

269-
See Sections <<gcode:g61,G61>> and <<gcode:g64,G64>>.
269+
See sections <<gcode:g61,G61>> and <<gcode:g64,G64>>.
270270

271271
[[cnc:interpreter-interaction-with-switches]]
272272
== Interpreter Interaction with Switches
@@ -306,7 +306,7 @@ is paused.
306306

307307
A tool table is required to use the Interpreter. The file tells which
308308
tools are in which tool changer slots and what the size and type of
309-
each tool is. The name of the tool table is defined in the ini file:
309+
each tool is. The name of the tool table is defined in the INI file:
310310

311311
[source,{ini}]
312312
----
@@ -318,7 +318,7 @@ TOOL_TABLE = tooltable.tbl
318318

319319
The default filename probably looks something like the above, but
320320
you may prefer to give your machine its own tool table, using the
321-
same name as your ini file, but with a tbl extension:
321+
same name as your INI file, but with a tbl extension:
322322

323323
[source,{ini}]
324324
----
@@ -333,7 +333,7 @@ TOOL_TABLE = EMC-AXIS-SIM.tbl
333333
----
334334

335335
For more information on the specifics of the tool table format, see the
336-
<<sec:tool-table,Tool Table Format>> Section.
336+
<<sec:tool-table,Tool Table Format>> section.
337337

338338
[[sec:machine-center-parameters]]
339339
== Parameters(((Parameters)))

0 commit comments

Comments
 (0)