Fix various typos #2582
Fix various typos #2582
Conversation
|
[luzpaz]
Follow-up to #2563
Question: is `configs/sim/woodpecker/woodpecker_/images/QTvcp
Widgets.html` OK to edit or is it generated ? Same question for
`share/qtvcp/screens/woodpecker/images/QTvcp Widgets.html` ?
Both include <meta name="generator" content="AsciiDoc 8.6.7">, making me
suspect they are generated. Searching for phrases I find
docs/src/gui/qtvcp-widgets.adoc. Perhaps it is the originating source
file? Comparing the two I suspect they are different generations of the
same content.
After checking git history of the adoc file, which changed name three
times since 2020, I am convinced the .html files are created using the
adoc file, and should probably be regenerated.
--
Happy hacking
Petter Reinholdtsen
|
|
Darn, I made the PR against master again 😞 |
luzpaz
force-pushed
the
typos-various-2.9
branch
from
1ca76cb to
a8c9c4e
Compare
And then rebase & force push your branch (or rebase first) |
| <property name="visible">True</property> | ||
| <property name="can-focus">False</property> | ||
| <property name="label">manuel</property> | ||
| <property name="label">manual</property> |
There was a problem hiding this comment.
I would suspect lbl_ntb_button_manuel need to change too? I can not find any traces of any use of the property or the label, so I guess it is safe to rename only here.
There was a problem hiding this comment.
I'm having issues pushing to my branch. @petterreinholdtsen feel free to push the changes and merge if you deem it worthy ?
|
These were passed to me from a third party. they are not generated in the linuxcnc project. |
|
Is there an upstream repo I can send these fixes to, in that case ? |
|
I had a closer look at these changes, and all of them seem correct to me. |
|
Seems like something broke the automated tests for 2.9 - and it is not this patch. Any idea anyone? |
|
[Steffen Möller]
Seems like something broke the automated tests for 2.9 - and it is not
this patch. Any idea anyone?
This is rather strange. The rip-and-test action seem to fail in the
tests/raster/ check, which I only find in master, not in 2.9. Anyone
know what is going on here?
…--
Happy hacking
Petter Reinholdtsen
|
|
@luzpaz You can try if a rebase and force push resolves this. |
|
@hansu - I think this is fine to be merged. That part that was cancelled is somewhere between buster (working) and bookworm (working). |
Follow-up to LinuxCNC#2563
luzpaz
force-pushed
the
typos-various-2.9
branch
from
a8c9c4e to
98599ae
Compare
|
I think a rebase wouldn't hurt anyway ... |
|
Done. |
|
Thanks |
5 participants
Follow-up to #2563
Question: is
configs/sim/woodpecker/woodpecker_/images/QTvcp Widgets.htmlOK to edit or is it generated ? Same question forshare/qtvcp/screens/woodpecker/images/QTvcp Widgets.html?