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

Use quoted section for preformatted text #3171

Merged
merged 29 commits into from
Dec 17, 2019
Merged

Conversation

beutlich
Copy link
Member

@beutlich beutlich commented Oct 24, 2019

@tobolar This is my brute-force search-and-replace. Not sure if it is good enough.

Resolves #2752.

@beutlich beutlich requested a review from tobolar October 24, 2019 08:53
@beutlich beutlich added the documentation Issue addresses the documentation label Oct 24, 2019
@tobolar
Copy link
Contributor

tobolar commented Oct 24, 2019

... and this my brute-force replacement of blanks in front of preformated text.
I will also update Modelica.UsersGuide.Conventions.Documentation.Format.Codein the next commit.

Copy link
Contributor

@tobolar tobolar left a comment

Choose a reason for hiding this comment

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

Fine to me now.

@beutlich beutlich marked this pull request as ready for review October 25, 2019 12:24
@beutlich beutlich added this to the MSL4.0.0 milestone Oct 25, 2019
@beutlich
Copy link
Member Author

I'll care for the merge-conflict in Semiconductors later.

@beutlich
Copy link
Member Author

@christiankral Can you please approve or reject? Otherwise, we will risk to get more and more conflicts.

@tobolar
Copy link
Contributor

tobolar commented Dec 5, 2019

(at)christiankral Can you please approve or reject? Otherwise, we will risk to get more and more conflicts.

@beutlich We have changed a huge amount of files which is hart to review reliably anyway. So I would suggest to use the brute-force for the third time here and to merge the changes. I know this brakes the rule of two reviewers at least but in this case I guess we can only reach reliable review using an automation. And this is partly done by CI used.

@beutlich
Copy link
Member Author

beutlich commented Dec 5, 2019

(at)christiankral Can you please approve or reject? Otherwise, we will risk to get more and more conflicts.

@beutlich We have changed a huge amount of files which is hart to review reliably anyway. So I would suggest to use the brute-force for the third time here and to merge the changes. I know this brakes the rule of two reviewers at least but in this case I guess we can only reach reliable review using an automation. And this is partly done by CI used.

Yes, I am in favour.

Copy link
Contributor

@christiankral christiankral left a comment

Choose a reason for hiding this comment

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

If I found everything OK: does that mean that I didn't read it careful enough?

@beutlich
Copy link
Member Author

beutlich commented Dec 8, 2019

@tobolar I resolved the merge conflicts once again (sigh). Can you please double-check, also in Modelica.Clocked. Thanks.

What still is strange is that there are 1629 occurences of <blockquote><pre> in MSL, but only 1627 occurences of </pre></blockquote>

@tobolar
Copy link
Contributor

tobolar commented Dec 17, 2019

@beutlich

What still is strange is that there are 1629 occurences of <blockquote><pre> in MSL, but only 1627 occurences of </pre></blockquote>

Done.

...also in Modelica.Clocked.

Checked.

@tobolar
Copy link
Contributor

tobolar commented Dec 17, 2019

@beutlich
I guess you really shall merge this now.

@beutlich
Copy link
Member Author

@beutlich

What still is strange is that there are 1629 occurences of <blockquote><pre> in MSL, but only 1627 occurences of </pre></blockquote>

Done.

Conformed. Thanks.

@beutlich
Copy link
Member Author

@beutlich
I guess you really shall merge this now.

Doing so right now.

@beutlich beutlich assigned beutlich and unassigned tobolar Dec 17, 2019
@beutlich beutlich merged commit d01fad6 into modelica:master Dec 17, 2019
@beutlich beutlich deleted the html branch December 17, 2019 14:20
@beutlich beutlich changed the title Use quoted section for preformated text Use quoted section for preformatted text Mar 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Issue addresses the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use quoted section for preformatted text
3 participants