diff options
| author | Sebastian Kuzminsky <seb@highlab.com> | 2013-11-08 08:47:17 -0700 |
|---|---|---|
| committer | Sebastian Kuzminsky <seb@highlab.com> | 2013-11-08 08:47:17 -0700 |
| commit | 0201b152a25dab525fd20cd60c8122770561aa5f (patch) | |
| tree | 3b3c1981b9e80edf01e6cd47ffb25e3120e3f524 | |
| parent | 85db6a80b1c7c3e8d2d8996036fd7c7c2a91cf24 (diff) | |
| parent | 7f29445474060b4ab4ba6a914ccc138942744dfd (diff) | |
| download | linuxcnc-0201b152a25dab525fd20cd60c8122770561aa5f.tar.gz linuxcnc-0201b152a25dab525fd20cd60c8122770561aa5f.zip | |
Merge branch 'v2.5_branch'
| -rw-r--r-- | docs/src/common/Getting_EMC.txt | 2 | ||||
| -rw-r--r-- | docs/src/common/System_Requirements.txt | 2 | ||||
| -rw-r--r-- | docs/src/config/ini_config.txt | 2 | ||||
| -rw-r--r-- | docs/src/config/pncconf.txt | 6 | ||||
| -rw-r--r-- | docs/src/gcode/gcode.txt | 2 | ||||
| -rw-r--r-- | docs/src/gui/gladevcp.txt | 2 | ||||
| -rw-r--r-- | docs/src/install/Latency_Test.txt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/docs/src/common/Getting_EMC.txt b/docs/src/common/Getting_EMC.txt index b88c705a5..422e50989 100644 --- a/docs/src/common/Getting_EMC.txt +++ b/docs/src/common/Getting_EMC.txt @@ -108,7 +108,7 @@ that anyone can add to or edit. The user maintained LinuxCNC Wiki site contains a wealth of information and tips at: -link:http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl[wiki.linuxcnc.org] +link:http://wiki.linuxcnc.org/[http://wiki.linuxcnc.org] == Getting LinuxCNC diff --git a/docs/src/common/System_Requirements.txt b/docs/src/common/System_Requirements.txt index 03e954839..27cf7d1aa 100644 --- a/docs/src/common/System_Requirements.txt +++ b/docs/src/common/System_Requirements.txt @@ -14,7 +14,7 @@ software step generation. More information on the Latency Test is Additional information is on the LinuxCNC Wiki site: -http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Hardware_Requirements[Wiki.LinuxCNC.org, Hardware_Requirements] +http://wiki.linuxcnc.org/cgi-bin/wiki.pl?Hardware_Requirements[Wiki.LinuxCNC.org, Hardware_Requirements] LinuxCNC and Ubuntu should run reasonably well on a computer with the following minimum hardware specification. These numbers are not the diff --git a/docs/src/config/ini_config.txt b/docs/src/config/ini_config.txt index 5811b0d9d..6f3becece 100644 --- a/docs/src/config/ini_config.txt +++ b/docs/src/config/ini_config.txt @@ -315,7 +315,7 @@ treated as g-code. One such example script is available at nc_files/holecircle.py. This script creates g-code for drilling a series of holes along the circumference of a circle. Many more g-code generators are on the LinuxCNC Wiki site -http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl[http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl]. +http://wiki.linuxcnc.org/[http://wiki.linuxcnc.org/]. If the environment variable AXIS_PROGRESS_BAR is set, then lines written to stderr of the form diff --git a/docs/src/config/pncconf.txt b/docs/src/config/pncconf.txt index fb01fb8b7..e2701f155 100644 --- a/docs/src/config/pncconf.txt +++ b/docs/src/config/pncconf.txt @@ -105,7 +105,7 @@ still be able to improve it. TIP: There is a user compiled list of equipment and the latency obtained on the LinuxCNC wiki : -http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Latency-Test +http://wiki.linuxcnc.org/cgi-bin/wiki.pl?Latency-Test Please consider adding your info to the list. Also on that page are links to info about fixing some latency problems. @@ -321,7 +321,7 @@ Auto Z touch-off also requires the classicladder touch-off program and a probe input selected. It requires a conductive touch-off plate and a grounded conductive tool. For an idea on how it works see: + -http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?ClassicLadderExamples#Single_button_probe_touchoff +http://wiki.linuxcnc.org/cgi-bin/wiki.pl?ClassicLadderExamples#Single_button_probe_touchoff + Under 'Display Options', size, position, and force max can be used on a 'stand-alone' panel for such things as placing the screen on a second monitor if @@ -552,7 +552,7 @@ set up and read a dial indicator to see if you are loosing steps. *Stepper Timing* Stepper timing needs to be tailored to the step controller's requirements. Pncconf supplies some default controller timing or allows custom timing settings -. See http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Stepper_Drive_Timing for +. See http://wiki.linuxcnc.org/cgi-bin/wiki.pl?Stepper_Drive_Timing for some more known timing numbers (feel free to add ones you have figured out). If in doubt use large numbers such as 5000 this will only limit max speed. diff --git a/docs/src/gcode/gcode.txt b/docs/src/gcode/gcode.txt index 172fbefa7..3ba1de809 100644 --- a/docs/src/gcode/gcode.txt +++ b/docs/src/gcode/gcode.txt @@ -531,7 +531,7 @@ image:images/nurbs01.png[align="center"] More information on NURBs can be found here: -http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?NURBS[http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?NURBS] +http://wiki.linuxcnc.org/cgi-bin/wiki.pl?NURBS[http://wiki.linuxcnc.org/cgi-bin/wiki.pl?NURBS] [[sec:G7-Diameter-Mode]] == G7 Lathe Diameter Mode diff --git a/docs/src/gui/gladevcp.txt b/docs/src/gui/gladevcp.txt index 9aa3bcafb..3aec5dcb2 100644 --- a/docs/src/gui/gladevcp.txt +++ b/docs/src/gui/gladevcp.txt @@ -394,7 +394,7 @@ Options: -t THEME:: set gtk theme. Default is system theme. Different panels can have different themes. - An example theme can be found in the http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?GTK_Themes[EMC Wiki]. + An example theme can be found in the http://wiki.linuxcnc.org/cgi-bin/wiki.pl?GTK_Themes[EMC Wiki]. -x XID:: Re-parent GladeVCP into an existing window XID instead of creating a diff --git a/docs/src/install/Latency_Test.txt b/docs/src/install/Latency_Test.txt index 066bd0521..157b73b37 100644 --- a/docs/src/install/Latency_Test.txt +++ b/docs/src/install/Latency_Test.txt @@ -70,7 +70,7 @@ the worst case latency doesn't happen very often, or only happens when you do some particular action. For instance, one Intel motherboard worked pretty well most of the time, but every 64 seconds it had a very bad 300 us latency. Fortunately that was -fixable, see http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?FixingSMIIssues +fixable, see http://wiki.linuxcnc.org/cgi-bin/wiki.pl?FixingSMIIssues So, what do the results mean? If your Max Jitter number is less than about 15-20 microseconds (15000-20000 nanoseconds), the |