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

[Minor] Fix "it's" that should be "its" #2595

Merged
merged 2 commits into from
Jul 15, 2019
Merged

[Minor] Fix "it's" that should be "its" #2595

merged 2 commits into from
Jul 15, 2019

Conversation

remram44
Copy link
Contributor

@remram44 remram44 commented Jul 6, 2019

I saw some "it's" that should have been "its", so I went over the whole doc. I actually found very few of those, so I guess I'm just overly pedant, but thought I'd send the patch anyway.

Cheers!

Copy link
Contributor

@cbscribe cbscribe left a comment

Choose a reason for hiding this comment

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

Thanks - just a couple of other fixes needed as well.

classes/class_csgshape.rst Outdated Show resolved Hide resolved
@akien-mga
Copy link
Member

Files in classes/ should not be modified, they are generated from the XML in https://github.com/godotengine/godot/tree/master/doc/classes

@remram44
Copy link
Contributor Author

remram44 commented Jul 6, 2019

Ok, thank you both! I think I have addressed your comments.

@cbscribe
Copy link
Contributor

Can you squash these into a single commit, please?

@remram44
Copy link
Contributor Author

remram44 commented Jul 14, 2019

Sure! Though if what you want is a single commit, GitHub has a button for that 😉

[edit: rebased as 2 commits: it's->its and other]

@NathanLovato
Copy link
Contributor

Sure! Though if what you want is a single commit, GitHub has a button for that wink

The squash feature on git has some limitations. We can use it here from time to time as the docs' history isn't super important, but e.g. not on the Godot repo as you won't get a merge commit, among other things that make a difference.

@NathanLovato NathanLovato merged commit 9189777 into godotengine:master Jul 15, 2019
@NathanLovato
Copy link
Contributor

Thanks for the help!

akien-mga pushed a commit to godotengine/godot that referenced this pull request Jul 29, 2019
See also godotengine/godot-docs#2595

(cherry picked from commit ddfd674)
myhalibobo pushed a commit to myhalibobo/godot that referenced this pull request Sep 3, 2019
fire pushed a commit to V-Sekai-archive/godot-csg-manifold that referenced this pull request Jun 11, 2022
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.

None yet

5 participants