Skip to content

Commit 49433d4

Browse files
authored
Merge pull request #2475 from LinuxCNC/little-doc-fixes
Little doc fixes
2 parents 2df883a + 2f1f8e7 commit 49433d4

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

docs/src/config/ini-config.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ Descriptions of the interfaces are in the Interfaces section of the User Manual.
271271
* `MAX_SPINDLE_0_SPEED = 20000` - The maximum RPM that can be manually selected.
272272
On multi spindle machine there will be entries for each spindle number. Only used by the QtVCP-based user interfaces.
273273
- _deprecated_ - use the [SPINDLE_n] section instead.
274-
* `PROGRAM_PREFIX = ~/linuxcnc/nc_files` - The default location for G-code files and the location for user-defined M-codes.
275-
This location is searched for the file name before the subroutine path and user M path if specified in the [RS274NGC] section.
274+
* `PROGRAM_PREFIX = ~/linuxcnc/nc_files` - The default directory for G-code files, named subroutines, and user-defined M-codes.
275+
The `PROGRAM_PREFIX` directory is searched before the directories listed in `[RS274]SUBROUTINE_PATH` and `[RS274]USER_M_PATH`.
276276
* `INTRO_GRAPHIC = emc2.gif` - The image shown on the splash screen.
277277
* `INTRO_TIME = 5` - The maximum time to show the splash screen, in seconds.
278278
* `CYCLE_TIME = 100` - Cycle time of the display GUI.

docs/src/gcode/o-code.adoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ they are defined. They may be called from other functions, and may call
129129
themselves recursively if it makes sense to do so. The maximum
130130
subroutine nesting level is 10.
131131

132-
Subroutines can change the value of parameters above #30 and those changes will
133-
be visible to the calling code. Subroutines may also change the value of global
134-
named parameters.
132+
Subroutines can change the value of parameters above #30 and those changes will be visible to the calling code. Subroutines may also change the value of <<gcode:named-parameters,global named parameters>> (i.e. parameters whose names begin with the underscore character "`_`");
135133

136134
[[ocode:fanuc-style-programs]]
137135
=== Fanuc-Style Numbered Programs(((Subroutines,M98,M99)))

0 commit comments

Comments
 (0)