Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ build-stamp
*.cmd
.tmp*
src/*.mod
# Ignore generated html files,
/docs/src/*/*.html
# docs/html/.gitignore is for the html directory
# Documentation-tree ignores live in docs/.gitignore.
debian/*.debhelper.log
rtlib/Module.symvers
share/*/*.desktop
Expand All @@ -26,8 +24,6 @@ share/linuxcnc/mesa_modbus.c.tmpl
src/modules.order
/configs/*/emc.nml
!/configs/common/emc.nml
/docs/src/source-highlight/local
docs/src/*/gui/gmoccapy_release_notes.txt
lib/python/gremlin.py
lib/python/qt5_graphics.py
lib/python/touchy
Expand Down
2 changes: 1 addition & 1 deletion debian/linuxcnc-doc-de.docs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ usr/share/doc/linuxcnc/LinuxCNC_Documentation_de.pdf
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_de.pdf
usr/share/doc/linuxcnc/LinuxCNC_Integrator_de.pdf

docs/html/de/gcode.html
docs/build/html/de/gcode.html
2 changes: 1 addition & 1 deletion debian/linuxcnc-doc-en.docs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ usr/share/doc/linuxcnc/axis_light_background
usr/share/doc/linuxcnc/rtfaults.adoc
usr/share/doc/linuxcnc/tklinuxcnc.adoc

docs/html/gcode.html
docs/build/html/en/gcode.html
2 changes: 1 addition & 1 deletion debian/linuxcnc-doc-ta.docs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ usr/share/doc/linuxcnc/LinuxCNC_Documentation_ta.pdf
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_ta.pdf
usr/share/doc/linuxcnc/LinuxCNC_Integrator_ta.pdf

docs/html/ta/gcode.html
docs/build/html/ta/gcode.html
2 changes: 1 addition & 1 deletion debian/linuxcnc-doc-uk.docs
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ usr/share/doc/linuxcnc/LinuxCNC_Developer_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Documentation_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Integrator_uk.pdf
docs/html/uk/gcode.html
docs/build/html/uk/gcode.html
56 changes: 54 additions & 2 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,54 @@
# generated when building pdf docs
index.html
# All ignores for the documentation tree live here (not in the top-level
# .gitignore). Paths are relative to docs/.

# Rendered output: HTML, PDF, and po4a-translated .adoc all land under build/.
/build/

# Intermediate .html asciidoctor writes beside each source .adoc before the
# copy step moves it into build/html/.
/src/*/*.html

Comment on lines +5 to +10
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have these a leading /? Using relative paths is a thing ;-)

(other places too)

# source-highlight local cache.
/src/source-highlight/local

Comment on lines +11 to +13
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Source-highlight was removed and you are using rouge. All the source-highlight stuff is obsolete.

# Generated component manpage list (gen_complist.py).
/src/hal/components_gen.adoc

Comment on lines +14 to +16
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to run po4a on the build/adoc/en tree and not have to generate the components_get.adoc in the src tree?

# SVGs rendered from the .dot sources in src/code/ (CMS_buffer.svg is committed).
/src/code/homing.svg
/src/code/homing_es.svg
/src/code/hss.svg
/src/code/hss_es.svg
/src/code/task-state-transitions.svg
/src/code/task-state-transitions_es.svg

Comment on lines +18 to +24
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be generated into the build tree.

We should keep the docs/src tree clean from anything generated for as much as possible.

# Troff manpages generated from .adoc by the asciidoctor manpage backend.
/man/man1/
/man/man3/
/man/man9/
Comment on lines +25 to +28
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't they be generated into the right place now?


# po4a-translated man trees.
/man/ar/*
/man/bg/*
/man/ckb/*
/man/cs/*
/man/da/*
/man/de/*
/man/es/*
/man/fr/*
/man/hu/*
/man/it/*
/man/ka/*
/man/nb/*
/man/pl/*
/man/pt/*
/man/pt_BR/*
/man/ro/*
/man/ru/*
/man/sai/*
/man/sk/*
/man/sv/*
/man/tr/*
/man/uk/*
/man/vi/*
/man/zh_CN/*
Comment on lines +30 to +54
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should now all be under build.

25 changes: 0 additions & 25 deletions docs/help/.gitignore

This file was deleted.

49 changes: 0 additions & 49 deletions docs/html/.gitignore

This file was deleted.

Loading
Loading