Skip to content

Commit

Permalink
Merge pull request #1675 from smoe/EnglishAnchorsMoreBeautifications
Browse files Browse the repository at this point in the history
English anchors more beautifications
  • Loading branch information
hansu committed Mar 30, 2022
2 parents 0eba0d0 + 3c91420 commit 103122a
Show file tree
Hide file tree
Showing 131 changed files with 3,030 additions and 9,798 deletions.
7 changes: 4 additions & 3 deletions debian/linuxcnc-doc-en.doc-base
Expand Up @@ -3,7 +3,8 @@ Title: LinuxCNC Documentation English
Section: Science/Engineering

Format: PDF
Files: /usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
Files:
/usr/share/doc/linuxcnc/LinuxCNC_Documentation.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Integrator.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Manual_Pages.pdf
3 changes: 2 additions & 1 deletion debian/linuxcnc-doc-es.doc-base
Expand Up @@ -3,5 +3,6 @@ Title: LinuxCNC Documentation Spanish
Section: Science/Engineering

Format: PDF
Files: /usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
Files:
/usr/share/doc/linuxcnc/LinuxCNC_Documentation_es.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_es.pdf
6 changes: 3 additions & 3 deletions debian/linuxcnc-doc-fr.doc-base
Expand Up @@ -3,7 +3,7 @@ Title: LinuxCNC Documentation French
Section: Science/Engineering

Format: PDF
Files: /usr/share/doc/linuxcnc/LinuxCNC_User_fr.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
/usr/share/doc/linuxcnc/LinuxCNC_HAL_fr.pdf
Files:
/usr/share/doc/linuxcnc/LinuxCNC_Documentation_fr.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_fr.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Integrator_fr.pdf
5 changes: 2 additions & 3 deletions debian/rules.in
Expand Up @@ -104,9 +104,8 @@ ifneq "$(enable_build_documentation)" ""
# Only the English developer documentation goes to the -dev package
mkdir -p debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev
mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev/ $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer.pdf
# The Spanish developer documentation goes to the spanish -doc package
mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev/ $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer_es.pdf

# The translated developer documentation goes to the respective regular -doc package
mv -t debian/$(DEV_PACKAGE_NAME)/usr/share/doc/linuxcnc-dev/ $(DESTDIR)/usr/share/doc/linuxcnc/LinuxCNC_Developer_*.pdf
for lang in zh_CN es fr; do \
p=$$(echo $$lang | tr _ - | tr A-Z a-z); \
d=debian/linuxcnc-doc-$$p/usr/share/doc/linuxcnc ; \
Expand Down
25 changes: 25 additions & 0 deletions docs/src/Master_Developer_fr.adoc
@@ -0,0 +1,25 @@
:lang: en
:lversion: {sys: cat ../VERSION}
:date: {sys: LANG=C date --date="@$(dpkg-parsechangelog --file ../debian/changelog -S timestamp)" '+%d %b %Y'}
:ascii-ids:
:masterdir: {indir}
:revdate: 2021-10-28
= Developer Manual V{lversion}, {date}
== Introduction

image::common/images/emc2-intro.png[]

include::common/overleaf_fr.adoc[]

:leveloffset: 1

//include::code/code-notes_fr.adoc[]
//include::code/nml-messages_fr.adoc[]
//include::code/style-guide_fr.adoc[]
//include::code/building-linuxcnc_fr.adoc[]
//include::code/adding-configs_fr.adoc[]
//include::code/contributing-to-linuxcnc_fr.adoc[]
include::common/glossary_fr.adoc[]
include::common/gpld-copyright_fr.adoc[]

// vim: set syntax=asciidoc:
4 changes: 0 additions & 4 deletions docs/src/Master_Documentation_es.adoc
Expand Up @@ -70,12 +70,8 @@ include::gui/gmoccapy_es.adoc[]

include::gui/ngcgui_es.adoc[]

include::gui/touchy_es.adoc[]

include::gui/gscreen_es.adoc[]

include::gui/tklinuxcnc_es.adoc[]

:leveloffset: 1

= Programacion
Expand Down
310 changes: 310 additions & 0 deletions docs/src/Master_Documentation_fr.adoc
@@ -0,0 +1,310 @@
:lang: en
:lversion: {sys: cat ../VERSION}
:date: {sys: LANG=C date --date="@$(dpkg-parsechangelog --file ../debian/changelog -S timestamp)" '+%d %b %Y'}
LinuxCNC V{lversion}, {date}
============================
:revdate: 2021-10-28

= Contents

:masterdir: {indir}

:leveloffset: 0

= About LinuxCNC

:leveloffset: 1

= Introduction

image::common/images/emc2-intro.png[]

include::common/overleaf.adoc[]

= LinuxCNC History

include::common/emc-history.adoc[]

:leveloffset: 0

= Using LinuxCNC

:leveloffset: 1

= General Info

:leveloffset: 2

include::user/user-foreword_fr.adoc[]

include::user/user-intro_fr.adoc[]

include::user/user-concepts_fr.adoc[]

//include::user/starting-linuxcnc_fr.adoc[]

include::gcode/machining-center_fr.adoc[]

include::getting-started/running-linuxcnc_fr.adoc[]

include::config/stepconf_fr.adoc[]

include::config/pncconf_fr.adoc[]

include::common/linux-faq_fr.adoc[]

include::lathe/lathe-user_fr.adoc[]

//include::plasma/plasma-cnc-primer_fr.adoc[]

:leveloffset: 1


= User Interfaces

:leveloffset: 2

include::gui/axis_fr.adoc[]

//include::gui/gmoccapy_fr.adoc[]

include::gui/ngcgui_fr.adoc[]

include::gui/touchy_fr.adoc[]

//include::gui/gscreen_fr.adoc[]

include::gui/tklinuxcnc_fr.adoc[]

//include::plasma/qtplasmac_fr.adoc[]

:leveloffset: 1

= Programming

:leveloffset: 2

include::gcode/coordinates_fr.adoc[]

include::gcode/overview_fr.adoc[]

include::gcode/g-code_fr.adoc[]

include::gcode/m-code_fr.adoc[]

include::gcode/o-code_fr.adoc[]

include::gcode/other-code_fr.adoc[]

include::examples/gcode_fr.adoc[]

include::gcode/rs274ngc_fr.adoc[]

include::gui/image-to-gcode_fr.adoc[]

:leveloffset: 1

= Tool Compensation

:leveloffset: 2

include::gcode/tool-compensation_fr.adoc[]

include::gui/tooledit_fr.adoc[]

:leveloffset: 0

= Configuration

:leveloffset: 1

= General Info

:leveloffset: 2

//include::config/integrator-concepts_fr.adoc[]

include::install/latency-test_fr.adoc[]

include::motion/tweaking-steppers_fr.adoc[]

include::config/stepper-diagnostics_fr.adoc[]

:leveloffset: 1

= Configuration

:leveloffset: 2

include::config/stepper-quickstart_fr.adoc[]

include::config/ini-config_fr.adoc[]

include::config/ini-homing_fr.adoc[]

//include::config/iov2_fr.adoc[]

include::config/lathe-config_fr.adoc[]

include::hal/haltcl_fr.adoc[]

//include::remap/remap_fr.adoc[]

//include::config/moveoff_fr.adoc[]

include::config/stepper_fr.adoc[]

:leveloffset: 1

= Control Panels

:leveloffset: 2

include::gui/pyvcp_fr.adoc[]

include::gui/pyvcp-examples_fr.adoc[]

include::gui/gladevcp_fr.adoc[]

:leveloffset: 1

= User Interfaces

:leveloffset: 2

//include::gui/panelui_fr.adoc[]

//include::gui/halui_fr.adoc[]

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

//include::config/python-interface_fr.adoc[]

//include::gui/vismach_fr.adoc[]

:leveloffset: 1

= Drivers

:leveloffset: 2

include::hal/parallel-port_fr.adoc[]

include::drivers/ax5214h_fr.adoc[]

include::drivers/gs2_fr.adoc[]

include::drivers/hostmot2_fr.adoc[]

include::drivers/motenc_fr.adoc[]

//include::drivers/mb2hal_fr.adoc[]

include::drivers/opto22_fr.adoc[]

include::drivers/pico-ppmc_fr.adoc[]

include::drivers/pluto-p_fr.adoc[]

//include::drivers/pmx485_fr.adoc[]

include::drivers/servo-to-go_fr.adoc[]

//include::drivers/shuttle_fr.adoc[]

//include::drivers/gm_fr.adoc[]

//include::drivers/vfs11_fr.adoc[]

:leveloffset: 1

= Driver Examples

:leveloffset: 2

include::examples/pci-parallel-port_fr.adoc[]

include::examples/spindle_fr.adoc[]

include::examples/mpg_fr.adoc[]

include::examples/gs2-example_fr.adoc[]

:leveloffset: 1

= PLC

:leveloffset: 2

include::ladder/ladder-intro_fr.adoc[]

//include::ladder/classic-ladder_fr.adoc[]

//include::ladder/ladder-examples_fr.adoc[]

:leveloffset: 1

= HAL

:leveloffset: 2

include::hal/intro_fr.adoc[]

include::hal/basic-hal_fr.adoc[]

//include::hal/twopass_fr.adoc[]

include::hal/tutorial_fr.adoc[]

include::hal/general-ref_fr.adoc[]

//include::config/core-components_fr.adoc[]

//include::hal/canonical-devices_fr.adoc[]

//include::hal/tools_fr.adoc[]

include::hal/halshow_fr.adoc[]

include::hal/components_fr.adoc[]

include::hal/rtcomps_fr.adoc[]

include::hal/hal-examples_fr.adoc[]

include::hal/comp_fr.adoc[]

include::hal/halmodule_fr.adoc[]


:leveloffset: 0

= Advanced Topics

:leveloffset: 1

include::motion/kinematics_fr.adoc[]

//include::motion/dh-parameters_fr.adoc[]

//include::motion/5-axis-kinematics_fr.adoc[]

//include::motion/switchkins_fr.adoc[]

include::motion/pid-theory_fr.adoc[]

//include::motion/external-offsets_fr.adoc[]

//include::tooldatabase/tooldatabase_fr.adoc[]

//include::code/rs274_fr.adoc[]

:leveloffset: 0

include::common/glossary_fr.adoc[]

include::common/gpld-copyright_fr.adoc[]

// = Index

// vim: set syntax=asciidoc:

0 comments on commit 103122a

Please sign in to comment.