Skip to content

update README.md and CONTRIBUTING.md#254

Merged
fpliger merged 12 commits intopyscript:mainfrom
jaynarayan-vaishnav:main
May 27, 2022
Merged

update README.md and CONTRIBUTING.md#254
fpliger merged 12 commits intopyscript:mainfrom
jaynarayan-vaishnav:main

Conversation

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor

Corrected the grammatical mistakes to make the documents easier to read and understand.

Corrected the grammatical mistakes to make the documents easier to read and understand.
Copy link
Copy Markdown

@shivaylamba shivaylamba left a comment

Choose a reason for hiding this comment

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

PyScript is a Pythonic alternative of Scratch, JSFiddle, or
instead of
PyScript is a Pythonic alternative of Scratch, JSFiddle or

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 6, 2022

Thanks for the suggestion @shivaylamba working on it.
done with it and added the file in PR.

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

@jezdez can you please review this PR.

Copy link
Copy Markdown
Contributor

@fpliger fpliger left a comment

Choose a reason for hiding this comment

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

@jaynarayan-vaishnav thank you for your contribution! I'm not sure the change adds to the message in this part of the documentation. I checked the text with a tech writer and the change from "to" to "of" seems off in this context. Also, I wouldn't add "any".. I don't feel like we can claim that honestly (although our goal may be in that direction).

I would keep the change to remove that one comma after "hackable". :)

Happy to be convinced otherwise, or to merge if you are ok with the above comments. TY!

@fpliger fpliger added tag: docs Related to the documentation status: paused PR that has been put on hold labels May 6, 2022
@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 6, 2022

Do you mean that the corrections are unnecessary with respect to the context of this document? and i have to change it to how it was before? I agree with the removal of , after hackable. I am sorry if I got your explanation in the wrong way @fpliger .
and i also feel like the , after frameworks should be replacted by a . as to correct the punctuation.
before:-
PyScript is a Pythonic alternative of Scratch, JSFiddle, or any other "easy to use" programming frameworks, making the web a friendly, hackable, place where anyone can author interesting and interactive
after:-
PyScript is a Pythonic alternative of Scratch, JSFiddle, or any other "easy to use" programming frameworks. making the web a friendly, hackable, place where anyone can author interesting and interactive

@fpliger
Copy link
Copy Markdown
Contributor

fpliger commented May 6, 2022

Oh, nothing to be sorry about :) , your help is much appreciated!

Yeah, I mean that I'd revert to how it was before and just change the '. So, basically, final version be:

PyScript is a Pythonic alternative to Scratch, JSFiddle, or other "easy to use" programming frameworks, making the web a friendly, hackable place where anyone can author interesting and interactive applications.

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 6, 2022

okay, I got Your Point thanks for helping me. 😄 and can you also check the comments in #61 that I made after the PR got merged as kathatherine said I should create a new issue or directly make a PR for the new found issue . can you suggest to me what should I do about that it would be really helpful

@fpliger
Copy link
Copy Markdown
Contributor

fpliger commented May 6, 2022

You can open a PR directly linking to the discussion you mentioned above or do it here, both are fine ways. If it was a big change I'd recommend opening a new issue/pr but seems a pretty limited change... 👍

made required changes
made necessary changes.
@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 6, 2022

I have merged both the issues in the same PR. can you please Review it.

@jaynarayan-vaishnav jaynarayan-vaishnav changed the title update README.md update README.md and CONTRIBUTING.md May 7, 2022
@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 8, 2022

@fpliger can you please review this PR. If there is something wrong i am ready to make changes

@fpliger
Copy link
Copy Markdown
Contributor

fpliger commented May 9, 2022

@jaynarayan-vaishnav was looking at this just right now. I think we can merge the changes if you'd like to re-open it.

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

@fpliger while i was fetching upstream there were some merge conflicts i will resolve them then reopen this PR if it's okay with you.

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 9, 2022

I've resolved the merge conflict and opened the PR again. Please review it @fpliger . Sorry if I made some Mistakes while resolving the merge conflict It's my first time facing such an issue so I tried my best to resolve it.

@jaynarayan-vaishnav
Copy link
Copy Markdown
Contributor Author

jaynarayan-vaishnav commented May 10, 2022

Hey @fpliger can you please review this otherwise there might be some conflicts like in the previous PR. Sorry for disturbing you time and again .

@fpliger fpliger removed the status: paused PR that has been put on hold label May 27, 2022
@fpliger fpliger merged commit bf3995d into pyscript:main May 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

tag: docs Related to the documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants