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

Clean up Reference Documentation #9668

Merged
merged 7 commits into from
Dec 13, 2021
Merged

Conversation

Buzzardo
Copy link

I did an editing pass on the entire user manual, to make it all be consistent with the other Spring documentation. Aside from the usual spelling, punctuation, and grammar changes, I also added quite a few links to the Javadoc and a few cross-references between sections.

@Buzzardo
Copy link
Author

I can't get the build to work, but I can't get the build to work (with the same errors) on the main branch, either.

@rwinch
Copy link
Member

rwinch commented May 26, 2021

@Buzzardo The build is working in our CI. Can you elaborate on

I can't get the build to work, but I can't get the build to work (with the same errors) on the main branch, either.

We cannot accept a PR that our build is not passing.

@rwinch rwinch self-assigned this May 26, 2021
@rwinch rwinch added in: docs An issue in Documentation or samples status: waiting-for-feedback We need additional information before we can continue type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels May 26, 2021
@rwinch
Copy link
Member

rwinch commented May 27, 2021

We worked on this offline. It turns out main is building fine and the errors are related to the changes made. I created and closed two issues related to what we discovered. See gh-9829 gh-9830

Now this PR needs to be rebased off of main to resolve the conflicts and pick up the changes I have pushed. Then we will be ready to merge.

@rwinch rwinch changed the title Editing pass Clean up Reference Documentation May 27, 2021
@Buzzardo
Copy link
Author

There. Now it all works.

Thanks very much, Rob.

One oddity I'd like to point out (to help people searching the topic in the future) is that the build seems to be touchy about the Java version. I fixed the first two errors (with help from @sjohnr - thanks to you, too, Steve) by using 11.0.7.hs-adpt rather than 11.0.9.j9-adpt (both through sdkman). That's why I thought the main branch was broken. Sorry for the confusion, and thanks again.

@spring-projects-issues spring-projects-issues added status: feedback-provided Feedback has been provided and removed status: waiting-for-feedback We need additional information before we can continue labels Jun 1, 2021
Copy link
Member

@rwinch rwinch left a comment

Choose a reason for hiding this comment

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

Thanks for the pull request. I think going forward it would be helpful if the pull request were broken up a little bit. For example, rather than submitting a pull request with 100+ files with changes split it up into sections. Changes that are grammar changes would be separate from dependency updates, formatting changes, and changes in conventions (proposing switching admonitions syntax).

I've provided feedback inline. Please let me mark a conversation as resolved as this helps me to ensure the changes I was expecting are what was made.

Additionally, I was curious if you had a style guide for the Spring team. For example, when using a code block ensure it is surrounded by ====. I think having these things documented, would help us to ensure the documentation going in was already fairly consistent so you don't have to make PRs fixing our inconsistencies.

@rwinch rwinch added status: waiting-for-feedback We need additional information before we can continue and removed status: feedback-provided Feedback has been provided labels Jun 3, 2021
Jay Bryant added 6 commits June 4, 2021 14:13
I went through everything to get it to fit with Spring's docuemntation standard.
Lots of small changes for punctuation, grammar, usage, voice, and so on.
Also added some links, mostly to the API Javadoc.
A file changed while I was working on it, as the developers
added more material for Kotlin. I edited the changes, to make
everything be consistent.
The switch to main triggered some conflicts, which I have fixed in this commit.
Fixes to make the build work.
Incorporated suggested changes from a review.
Mostly restoring the formatting of admonitions.
I missed three block delimiters while restoring admonition formatting.
@rwinch rwinch assigned rwinch and unassigned rwinch Nov 16, 2021
@rwinch rwinch closed this in 2fb056b Dec 13, 2021
@rwinch rwinch merged commit 2fb056b into spring-projects:main Dec 13, 2021
@rwinch rwinch added this to the 6.0.0-M1 milestone Dec 13, 2021
@rwinch rwinch removed the status: waiting-for-feedback We need additional information before we can continue label Dec 13, 2021
@rwinch
Copy link
Member

rwinch commented Dec 13, 2021

Thanks for the PR @Buzzardo! I've merged this into main

sjohnr added a commit that referenced this pull request Dec 15, 2022
Apply editing changes from gh-9668
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: docs An issue in Documentation or samples type: enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants