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

docs: misc changes triggered while revisiting translations (smoe:docs29_mac_104) #2592

Merged
merged 5 commits into from
Aug 4, 2023

Conversation

smoe
Copy link
Contributor

@smoe smoe commented Jul 21, 2023

Not too much left.

Copy link
Member

@hansu hansu left a comment

Choose a reason for hiding this comment

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

And please rebase to resolve the conflict.

docs/src/code/writing-tests.adoc Outdated Show resolved Hide resolved
docs/src/ladder/classic-ladder.adoc Outdated Show resolved Hide resolved
docs/src/ladder/classic-ladder.adoc Outdated Show resolved Hide resolved
The larger verbatim text is not anchored in the text.
Here an attempt to introduce the block as we would integrate a figure, i.e. with a caption.
@smoe
Copy link
Contributor Author

smoe commented Aug 4, 2023

@hansu, I messed up, performed the rebase without first pulling your changes. Please kindly have a look at a1359dd to ensure that this addresses all in the way you wanted this to be addressed.

@hansu
Copy link
Member

hansu commented Aug 4, 2023

@hansu, I messed up, performed the rebase without first pulling your changes. Please kindly have a look at a1359dd to ensure that this addresses all in the way you wanted this to be addressed.

I haven't done any changes to your branch. But the change from my first comment seems got lost.

@smoe
Copy link
Contributor Author

smoe commented Aug 4, 2023

@hansu, I messed up, performed the rebase without first pulling your changes. Please kindly have a look at a1359dd to ensure that this addresses all in the way you wanted this to be addressed.

I haven't done any changes to your branch. But the change from my first comment seems got lost.

Those changes from your comments I have meant to have reintroduced in a1359dd . I had felt just fine wrt having addressed all issues, just I was not sure if I was interpreting all your changes correctly. What change from your first comment are you referring to?

Co-authored-by: Hans Unzner <hansunzner@gmail.com>
@smoe
Copy link
Contributor Author

smoe commented Aug 4, 2023

Accepted your suggested change, and also pulled it into my local repository, just to be sure :)

@smoe
Copy link
Contributor Author

smoe commented Aug 4, 2023

There is no docs29_mac_105 branch on my side, so this may indeed be the last change from my side that would not contribute some content. Happy!

@hansu
Copy link
Member

hansu commented Aug 4, 2023

There is no docs29_mac_105 branch on my side, so this may indeed be the last change from my side that would not contribute some content. Happy!

We will see ;-)

@hansu hansu merged commit de3b0fa into LinuxCNC:2.9 Aug 4, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants