Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

English anchors more beautifications #1675

Merged
merged 25 commits into from Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
483dbc6
Yet another iteration on anchors.
smoe Mar 19, 2022
324c997
Series of beautifications of no immediate functional use.
smoe Mar 20, 2022
fd105d9
Smallish simplifications/fixes for ladder/*fr
smoe Mar 22, 2022
0d4d8d8
pncconf_fr moved to config
smoe Mar 22, 2022
c94ef86
Reviewed docs/src/plasma - seems fine.
smoe Mar 22, 2022
f3960a0
Removed all-English _fr files also from template
smoe Mar 22, 2022
e709403
Eliminated all-English files from Master_Integrator_fr
smoe Mar 22, 2022
6cce8a2
Revert me - attempting to overcome build error
smoe Mar 23, 2022
a11ad51
docs/_es: all-English target was removed
smoe Mar 23, 2022
c7efe1c
Removed more all-English _es files, synced anchors
smoe Mar 23, 2022
99cff9d
docs: Linting and all-English removals in gui
smoe Mar 23, 2022
1e26172
docs.xml: corrected/updated filenames
smoe Mar 23, 2022
23d546b
Removed more all-English _es files
smoe Mar 23, 2022
1dc2eee
Attempt to bring _fr documentation building in line with _es and _en
smoe Mar 23, 2022
57f8ffb
Introduce analogous Developer_fr manual, but not integrated in build
smoe Mar 23, 2022
0784d18
Removed reference to image from hal folder
smoe Mar 23, 2022
2cf9611
Simplifications, syntax fixes, increasing similarity between _fr, _en…
smoe Mar 23, 2022
08ce46a
Rename Master_ -> Master- to help sep language tag
smoe Mar 23, 2022
06e5975
Series of smallish changes to trigger rebuild
smoe Mar 24, 2022
5573df5
Removed unused anchor
smoe Mar 24, 2022
097a8a1
docs: removed some duplicated descriptions
smoe Mar 29, 2022
8d33a70
docs: fixed two links
smoe Mar 29, 2022
c55a27a
Undoing elimination of underscores in manuals
smoe Mar 29, 2022
9fd029e
Reintroduced touchy_es.adoc
smoe Mar 30, 2022
3c91420
Syntax adjustments for touchy_es.adoc
smoe Mar 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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: