[FIX] Remove duplicate words

SAP-docs / sapui5

This is the markdown version of the official SAPUI5 documentation from the SAPUI5 Demo Kit for external contributions.

Creative Commons Attribution 4.0 International

79 stars 126 forks source link

[FIX] Remove duplicate words #34

Closed boghyon closed 1 year ago

boghyon commented 1 year ago

Similar to https://github.com/SAP/openui5/commit/9311d7b0bf6b0df9c571506502455310c1a0f8e6, fixing duplicated words such as the the, in in, is is, to to, about about, etc. in the documentation.

KvM2 commented 1 year ago

Thanks,@boghyon , for your valuable contribution and your eye for detail. We appreciate it and will look into it .

boghyon commented 1 year ago

@KvM2 Thanks Katja. Btw. the is is case should've been corrected to it is , but my initial commit simply removed the former is part. Now I added the missing it, squashed the two commits into one, and pushed again. Everything should be correct now.

KvM2 commented 1 year ago

@boghyon, great! Thanks for the effort.

KvM2 commented 1 year ago

Hello @boghyon, I have now updated the documentation based on your feedback. The changes will be available with 1.112. Thanks again for your contribution!

boghyon commented 1 year ago

Thanks, I guess I abandon this PR? Or is there anything I could do (e.g. resolving the merge conflict)? Otherwise, I'd close this PR.

KvM2 commented 1 year ago

That would be great. I think the conflict is just because I already edited some of the (source) files earlier. You could either resolve the conflict or even close it , which might be easier.

boghyon commented 1 year ago

@KvM2 Closed. How can we make PRs easier to merge in the future? Should we contribute changes in this SAPUI5-docs and in OpenUI5-docs separately even if the OpenUI5 content can be found also in this repo?

KvM2 commented 1 year ago

Hi Boghyon, I think using this repo should usually work. I assume this was a special situation with the large number of files that were part of your change, and because I couldn't make all the changes right away. If this occurs again, let's have a closer look.

OlMue commented 1 year ago

Hi @boghyon and @KvM2, just some additional food for thought on this:

OpenUI5-docs is the MD version of the published OpenUI5 documentation aimed at external OpenUI5 users
SAPUI5-docs is the MD version of the published SAPUI5 documentation aimed at external SAPUI5 users
https://github.wdf.sap.corp/UICS-Consumption/UI5-docs is the MD version of the SAPUI5 documentation currently in development plus some internal content aimed at internal SAPUI5 users (and available only internally at SAP)

They're all based on the same DITA XML source, so it theoretically doesn't matter which repo you're using for PRs unless they're specific to SAPUI5/OpenUI5/internal content. If we implement the contribution in our DITA XML source, it will be changed in all three repos/outputs anyway. But since you're an SAP employee, the third repo might be better in certain cases because you can also have "internal" discussions there. I hope this makes sense. ;-)