Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ebbf18b
config/ en edits from fr migration
silopolis Apr 4, 2022
9c62770
gcode/ en edits from fr migration
silopolis Apr 4, 2022
b056b2f
gui/ en edits from fr migration
silopolis Apr 4, 2022
bad8df2
hal/ en edits from fr migration
silopolis Apr 5, 2022
0eb1780
install/ en edits from fr migration
silopolis Apr 5, 2022
d3f0393
ladder/ en edits from fr migration
silopolis Apr 5, 2022
b477f87
user/ en edits from fr migration
silopolis Apr 5, 2022
9fe39d4
motion/ en edits from fr migration
silopolis Apr 5, 2022
103a0b7
Fix build warnings and errors
silopolis Apr 6, 2022
78eb18b
Anchors fixes
silopolis Apr 6, 2022
add37af
More tries at fixing anchors
silopolis Apr 6, 2022
d8b8976
reviewed and back-translated changes from #1516
hansu Apr 6, 2022
0ff23b8
docs: Removed redundant 'sec:tool-table' anchor
smoe Apr 6, 2022
4256070
meant to only quickly fix one missing anchor
smoe Apr 6, 2022
877c64d
Merge pull request #7 from smoe/fr_backgranslation
silopolis Apr 7, 2022
ecf4cad
More fr backtranslation
silopolis Apr 7, 2022
3b77938
Merge remote-tracking branch 'hansu/backtranslation-es' into fr_backt…
silopolis Apr 7, 2022
376d313
Unstaged files from merge
silopolis Apr 7, 2022
de2d4f2
Another anchor fix spotted by @smoe
silopolis Apr 7, 2022
fdae685
Anchor fixes spotted by @smoe
silopolis Apr 7, 2022
5bd3128
Merge branch 'fr_backtranslation' of https://github.com/silopolis/lin…
silopolis Apr 7, 2022
2731fe8
docs: Fixed stupid copy'n'paste anchor-error
smoe Apr 7, 2022
26f5f7e
references to o-code_fr
smoe Apr 7, 2022
a3e2e30
docs: sec:Codes-de-mesure -> gcode:probing-codes
smoe Apr 7, 2022
2bd1d0d
docs: Fixed sub:stepgen-parameters anchor
smoe Apr 7, 2022
42c1149
docs:Testing if anchor needs to embedded
smoe Apr 7, 2022
1da43ca
Optics - did not see reported error on latency-testing
smoe Apr 7, 2022
e24c118
Backtranslated, attempted to address anchors
smoe Apr 7, 2022
07a5b72
Still chasing anchors and linting along the way
silopolis Apr 7, 2022
9dcecdf
More anchors chasing
silopolis Apr 7, 2022
3b50d07
Local build happy, maybe last anchors fix commit
silopolis Apr 7, 2022
e40e477
An URL fix and a pinch of format fixes
silopolis Apr 8, 2022
ad76b70
Reviewing :lang: settings. And linting g-code_es.adoc
smoe Apr 8, 2022
bde45db
Remove remaining byte-order marks from docs files
silopolis Apr 8, 2022
37389fc
Fixing XML structure for xmllint
smoe Apr 8, 2022
31f8847
docs: fixed redundant tklinux anchor
smoe Apr 8, 2022
79b978b
docs: another anchor and linting for gui/axis*adoc
smoe Apr 8, 2022
b0f20f3
Fix code blocks language specs
silopolis Apr 8, 2022
bb6e3f9
docs: Addressing missing anchors
smoe Apr 8, 2022
c2ab6df
Add basebackend@docbook attributes
silopolis Apr 8, 2022
069b648
Reintroduce curly braces around lang def
silopolis Apr 8, 2022
8977966
review comments part 1 (up to dir gcode)
hansu Apr 8, 2022
f9c9536
docs: review comments part 2/2
hansu Apr 10, 2022
b047124
docs: changes according to review comments
hansu Apr 10, 2022
9eca495
docs: Reversing comment to temp reduce complexity
smoe Apr 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/help/asciidoc-markup.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Encabezados de archivo de documento maestro, primera línea reemplazar "en" con
:lversion: {sys: cat ../VERSION}
Comenzar V{lversion}, {localdate}
===============================
:lang:en
:lang: en
:masterdir: {indir}
:leveloffset: 1
El equipo de EMC
Expand Down
16 changes: 8 additions & 8 deletions docs/html/gcode_fr.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@
<TR> <TD> <A HREF="gcode/o-code_fr.html#cha:O-codes">O &hellip;</A> <TD COLSPAN=2> sub/endsub, while/endwhile, if/else/endif, do/while, call, break/continue/return </TR>

<TR> <TH COLSPAN=3>Contr&ocirc;le de flux </TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#sec:Sous-programmes">O- sub</A> <TD> <TD>Sous-programmes, sub/endsub call</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#sec:Boucles">O- while</A> <TD> <TD>Boucles, while/endwhile do/while</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#sec:Conditionnels">O- if</A> <TD> <TD>Conditionnels, if/else/endif</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#sec:Repetitions">O- repeat</A> <TD> <TD>R&eacute;p&egrave;te n fois l'ex&eacute;cution de blocs de code</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#ocode:subroutines">O- sub</A> <TD> <TD>Sous-programmes, sub/endsub call</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#ocode:looping">O- while</A> <TD> <TD>Boucles, while/endwhile do/while</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#ocode:conditional">O- if</A> <TD> <TD>Conditionnels, if/else/endif</TR>
<TR> <TD> <A HREF="gcode/o-code_fr.html#ocode:repeat">O- repeat</A> <TD> <TD>R&eacute;p&egrave;te n fois l'ex&eacute;cution de blocs de code</TR>
<TR> <TD> <A HREF="gcode/m-code_fr.html#mcode:m70">M70</A> <TD> <TD>Enregistre l'&eacute;tat modal</TR>
<TR> <TD> <A HREF="gcode/m-code_fr.html#mcode:m71">M71</A> <TD> <TD>Invalide l'&eacute;tat modal enregistr&eacute;</TR>
<TR> <TD> <A HREF="gcode/m-code_fr.html#mcode:m72">M72</A> <TD> <TD>Restaure l'&eacute;tat modal enregistr&eacute;</TR>
Expand Down Expand Up @@ -157,10 +157,10 @@
<TR> <TD> <A HREF="gcode/g-code_fr.html#gcode:g92.3">G92.3</A> <TD> <TD> Applique le contenu des param&eacute;tres aux d&eacute;calages d'origine </TR>
<TR> <TD> <A HREF="gcode/m-code_fr.html#mcode:m100-m199">M101&hellip;M199</A> <TD> P Q <TD> M-codes d&eacute;finis par l'op&eacute;rateur </TR>
<TR> <TH COLSPAN=3>Commentaires et messages</TR>
<TR> <TD> <A HREF="gcode/overview_fr.html#sec:Commentaires">(&hellip;)</A> <TD> <TD> Un commentaire "<STRONG>&hellip;</STRONG>" pour l'op&eacute;rateur</TR>
<TR> <TD> <A HREF="gcode/overview_fr.html#sec:Messages">(MSG,&hellip;)</A> <TD> <TD> Affiche le message "<STRONG>&hellip;</STRONG>" pour l'op&eacute;rateur (ex: dans une fen&ecirc;tre)</TR>
<TR> <TD COLSPAN=2> <A HREF="gcode/overview_fr.html#sec:Messages-debogage">(DEBUG,&hellip;#123&hellip;#&lt;foo&gt;)</A> <TD> Affiche le message (avec substitution de variables) comme MSG</TR>
<TR> <TD COLSPAN=2> <A HREF="gcode/overview_fr.html#sec:Messages-debogage">(PRINT,&hellip;#123&hellip;#&lt;foo&gt;)</A> <TD> Affiche le message (avec substitution de variables) dans stderr</TR>
<TR> <TD> <A HREF="gcode/overview_fr.html#gcode:comments">(&hellip;)</A> <TD> <TD> Un commentaire "<STRONG>&hellip;</STRONG>" pour l'op&eacute;rateur</TR>
<TR> <TD> <A HREF="gcode/overview_fr.html#gcode:messages">(MSG,&hellip;)</A> <TD> <TD> Affiche le message "<STRONG>&hellip;</STRONG>" pour l'op&eacute;rateur (ex: dans une fen&ecirc;tre)</TR>
<TR> <TD COLSPAN=2> <A HREF="gcode/overview_fr.html#gcode:debug">(DEBUG,&hellip;#123&hellip;#&lt;foo&gt;)</A> <TD> Affiche le message (avec substitution de variables) comme MSG</TR>
<TR> <TD COLSPAN=2> <A HREF="gcode/overview_fr.html#gcode:print">(PRINT,&hellip;#123&hellip;#&lt;foo&gt;)</A> <TD> Affiche le message (avec substitution de variables) dans stderr</TR>
</TABLE>
<SCRIPT type="text/javascript"><!--
var rows=document.evaluate('//tr', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Master_Developer_es.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:lversion: {sys: cat ../VERSION}
:lversion: {sys: cat ../VERSION}
:date: {sys: LANG=C date --date="@$(dpkg-parsechangelog --file ../debian/changelog -S timestamp)" '+%d %b %Y'}
Manual del Desarrollador V{lversion}, {date}
============================================
Expand Down
6 changes: 3 additions & 3 deletions docs/src/Master_Documentation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ include::gui/qtvcp.adoc[]

:leveloffset: 3

include::gui/qtvcp-VCPpanels.adoc[]
include::gui/qtvcp-vcp-panels.adoc[]

include::gui/qtvcp-widgets.adoc[]

Expand All @@ -194,6 +194,8 @@ include::gui/panelui.adoc[]

include::gui/halui.adoc[]

include::gui/GStat.adoc[]

include::hal/halui-examples.adoc[]

include::config/python-interface.adoc[]
Expand Down Expand Up @@ -326,5 +328,3 @@ include::common/gpld-copyright.adoc[]
// = Index

// vim: set syntax=asciidoc:


3 changes: 1 addition & 2 deletions docs/src/Submakefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DOC_SRCS_EN := \
gui/gscreen.adoc \
gui/qtdragon.adoc \
gui/qtvcp.adoc \
gui/qtvcp-VCPpanels.adoc \
gui/qtvcp-vcp-panels.adoc \
gui/qtvcp-widgets.adoc \
gui/qtvcp-libraries.adoc \
gui/qtvcp-vismach.adoc \
Expand Down Expand Up @@ -662,4 +662,3 @@ docs:
$(error Cannot build documents, missing AsciiDoc or some other required program, or explicitly disabled in configure)

endif

Loading