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

Users/Docker_Image.rst: Fix copyright violation #494

Merged
merged 1 commit into from
Mar 30, 2018

Conversation

acashmkj
Copy link
Contributor

@acashmkj acashmkj commented Nov 14, 2017

Fixed copyright violation in Users/Docker_Image.rst by referencing the
source and added refernce to CC-BY-SA 4.0 license

Closes #482

For short term contributors: we understand that getting your commits well
defined like we require is a hard task and takes some learning. If you
look to help without wanting to contribute long term there's no need
for you to learn this. Just drop us a message and we'll take care of brushing
up your stuff for merge!

Checklist

  • I read the commit guidelines and I've followed
    them.
  • I ran coala over my code locally. (All commits have to pass
    individually.
    It is not sufficient to have "fixup commits" on your PR,
    our bot will still report the issues for the previous commit.) You will
    likely receive a lot of bot comments and build failures if coala does not
    pass on every single commit!

After you submit your pull request, DO NOT click the 'Update Branch' button.
When asked for a rebase, consult coala.io/rebase
instead.

Please consider helping us by reviewing other peoples pull requests as well:

The more you review, the more your score will grow at coala.io and we will
review your PRs faster!

@Makman2
Copy link
Member

Makman2 commented Nov 15, 2017

Please use Closes instead of Fixes, the issue is not a bug.

@@ -1,6 +1,8 @@
What is Docker?
===============

According to `opensource.com <https://opensource.com/resources/what-docker>`__:
Copy link
Member

Choose a reason for hiding this comment

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

Hmm that reads bad as a first sentence. Rather I would make some kind of citation at the end^^

Also:

The layout needs to be very clear that it is an unmodified copy only, and no editing of the text is desirable.

Not sure that this intention gets to the reader here^^

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Made the requested changes

@Makman2
Copy link
Member

Makman2 commented Nov 15, 2017

unack 684e22a

not already running on the host computer. This gives a significant
performance boost and reduces the size of the application.

Source for this information is `opensource.com <https://opensource.com/resources/what-docker>`__.
Copy link
Member

Choose a reason for hiding this comment

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

Maybe just Cited from ...

@Makman2
Copy link
Member

Makman2 commented Nov 15, 2017

Commit message: Please add a tag (Docker_Image.rst or Users/Docker_Image.rst) with a verb describing what you've done (E.g. "Fix copyright violation" or "Cite correctly" etc etc)

Also add please a commit body describing why the text has changed (to make a full cite without any differences).

@Makman2
Copy link
Member

Makman2 commented Nov 15, 2017

unack a263ecc

Copy link
Member

@jayvdb jayvdb left a comment

Choose a reason for hiding this comment

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

The layout needs to be more explicit that it is a copy, and it needs to say it is copied under the terms of the CC-BY-SA-4

@acashmkj
Copy link
Contributor Author

@jayvdb added that it is used under CC-BY-SA 4.0 along with the link.

@acashmkj acashmkj closed this Nov 18, 2017
@acashmkj acashmkj reopened this Nov 18, 2017
@Makman2
Copy link
Member

Makman2 commented Nov 18, 2017

☝️ #494 (comment)

@acashmkj acashmkj force-pushed the master branch 2 times, most recently from ab31c27 to d7069e5 Compare November 18, 2017 18:33
@acashmkj acashmkj changed the title Copyright violation in Users/Docker_Image.rst Users/Docker_Image.rst: Fix copyright violation Nov 18, 2017
Copy link
Member

@jayvdb jayvdb left a comment

Choose a reason for hiding this comment

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

It needs to be block quoted.

And the commit message is still not right.

Copy link
Member

@nalinbhardwaj nalinbhardwaj left a comment

Choose a reason for hiding this comment

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

@acashmkj : As other reviewers have already noted, you need to make the copied text(the one for which the license is applicable) a block-quote. You can do so by indenting the paragraph. Here’s some documentation for help

Also, looks like your commit message has and CC-BY-SA license. in a line by itself, make that a part of the commit body please.

@jayvdb
Copy link
Member

jayvdb commented Mar 10, 2018

@gitmate-bot rebase

@gitmate-bot
Copy link

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@gitmate-bot
Copy link

Automated rebase with GitMate.io was successful! 🎉

@Makman2
Copy link
Member

Makman2 commented Mar 30, 2018

ack ca85ea3

@Makman2
Copy link
Member

Makman2 commented Mar 30, 2018

@gitmate-bot rebase

and CC-BY-SA license.

Added citation source and cited without any change
and added reference to CC-BY-SA 4.0 license

Closes coala#482
@gitmate-bot
Copy link

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@gitmate-bot
Copy link

Automated rebase with GitMate.io was successful! 🎉

@Makman2
Copy link
Member

Makman2 commented Mar 30, 2018

@gitmate-bot ff

@gitmate-bot
Copy link

Hey! I'm GitMate.io! This pull request is being fastforwarded automatically. Please DO NOT push while fastforward is in progress or your changes would be lost permanently ⚠️

@gitmate-bot
Copy link

Automated fastforward with GitMate.io was successful! 🎉

@gitmate-bot gitmate-bot merged commit a01938b into coala:master Mar 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

Copyright violation in Users/Docker_Image.rst
6 participants