Filippo Giunchedi has submitted this change and it was merged. Change subject: update legal terms for dumps.wm.o ......................................................................
update legal terms for dumps.wm.o RT #7450 Change-Id: Ic7516d3c1fb65325eb45abc54f09b510227d55f4 --- M modules/snapshot/files/dumps/templates/legal.html 1 file changed, 137 insertions(+), 36 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved LVilla (WMF): Looks good to me, but someone else must approve diff --git a/modules/snapshot/files/dumps/templates/legal.html b/modules/snapshot/files/dumps/templates/legal.html index aa67c3a..3271b78 100644 --- a/modules/snapshot/files/dumps/templates/legal.html +++ b/modules/snapshot/files/dumps/templates/legal.html @@ -1,44 +1,145 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr"> + <head> -<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>Copyrights information</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>License information about Wikimedia dump downloads</title> + <style type="text/css" media="screen,projection">/*<![CDATA[*/ +body { + font: x-small sans-serif; + background: #f9f9f9 url(http://en.wikipedia.org/skins-1.5/monobook/headbg.jpg) 0 0 no-repeat; + color: black; + margin: 0; + padding: 0; +} +/* scale back up to a sane default */ +#globalWrapper { + font-size: 127%; + width: 100%; + margin: 0; + padding: 0; +} +#content { + margin: 2em 2em 0 2em; + padding: 0 1em 1.5em 1em; + background: white; + color: black; + border: 1px solid #aaa; + line-height: 1.5em; + position: relative; + z-index: 2; +} +h1, h2, h3, h4, h5, h6 { + color: black; + background: none; + font-weight: normal; + margin: 0; + padding-top: .5em; + padding-bottom: .17em; + border-bottom: 1px solid #aaa; +} +h1 { + font-size: 188%; + margin-bottom: .6em; +} +h2 { + font-size: 150%; + margin-bottom: .6em; +} +h3, h4, h5, h6 { + border-bottom: none; + font-weight: bold; + margin-bottom: .3em; +} + +ul { + line-height: 1.5em; + list-style-type: square; + margin: .3em 0 0 1.5em; + padding: 0; + list-style-image: url(bullet.gif); +} +ol { + line-height: 1.5em; + margin: .3em 0 0 3.2em; + padding: 0; + list-style-image: none; +} +li { + margin-bottom: .1em; +} +dt { + font-weight: bold; + margin-bottom: .05em; +} +dl { + margin-top: .2em; + margin-bottom: .5em; +} +dd { + line-height: 1.5em; + margin-left: 2em; + margin-bottom: .5em; +} +a { + text-decoration: none; + color: #002bb8; + background: none; +} +a:visited { + color: #5a3696; +} +a:active { + color: #faa700; +} +a:hover { + text-decoration: underline; +} + +dl {margin-left:4em;margin-right:4em;} +.visualClear { + clear: both; +} + +/*]]>*/</style> + </head> - <body> -<h1>Copyright and license</h1> -<p>All original textual content except Wikinews original textual content is -licensed under the <a href="http://www.wikipedia.org/wiki/Wikipedia:Copyrights"; title="Wikipedia Copyrights"> -GNU Free Documentation License</a> (GFDL) and the -<a href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 3.0 License</a>. Some text may be available only under the Creative Commons license; see our -<a href="http://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use</a> for details. -Text written by some authors may be released under additional licenses -or into the public domain. Some text (including quotations) may -be used under fair use, usually where it is believed that the use -will also be fair dealing outside the United States (US). Note that material -used as "fair use" under United States law may not be legal to -reproduce outside the US. See -<a href="http://en.wikipedia.org/wiki/Fair_use";>Fair use</a> for more information.</p> + <div id="globalWrapper"> + <div id="content"> + <h1>License information</h1> + <p>Wikimedia’s <a href="https://wikimediafoundation.org/wiki/Mission";>mission</a> is to create educational content that is freely available to all people. In keeping with that goal, all information on Wikimedia projects may be freely shared, copied, remixed, and used for any purpose (including commercial purposes!) in perpetuity. To help guide users of <a href="http://dumps.wikimedia.org/";>dumps.wikimedia.org</a>, this page contains more detailed information about Wikimedia’s licensing and licensing policies as they may apply to our dumps.</p> + <div style="background:#ffeeee;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;">This is a high-level guide only. Where this information conflicts with specific information in the <a href="https://wikimediafoundation.org/wiki/Terms_of_Use";>Wikimedia Foundation Terms of Use</a>, or with other information contained inside the dumps themselves, this description should be ignored. Those terms are controlling.</div> + <h2>Text</h2> -<p>As of 2005-09-25 all Wikinews textual content is licensed under the -<a href="http://creativecommons.org/licenses/by/2.5/"; title="Creative Commons Attribution 2.5 License">Creative Commons Attribution 2.5 License</a>, -All Wikinews material published prior to that date (2005-09-25) is in the public domain.</p> +<p>Except as discussed below, all original textual content is licensed under the <a href="http://www.wikipedia.org/wiki/Wikipedia:Copyrights"; title="Wikipedia Copyrights"> +GNU Free Documentation License</a> (GFDL) and the <a href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 3.0 License</a>. Some text may be available only under the Creative Commons license; see our <a href="http://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use</a> for details. Text written by some authors may be released under additional licenses or into the public domain.</p> + <h2>Images</h2> + <p>By default, images uploaded to our services are under the <a href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 3.0 License</a>. However, many images are NOT released under Creative Commons. Image copyright information is contained in the image description page inside the text dumps.<p> + <h2>Exceptions</h2> + <h3>Wikinews</h3> + <p>As of 2005-09-25 all Wikinews textual content is licensed under the <a href="http://creativecommons.org/licenses/by/2.5/"; title="Creative Commons Attribution 2.5 License">Creative Commons Attribution 2.5 License</a>. All Wikinews material published prior to that date (2005-09-25) is in the public domain.</p> + <h3>Wikidata</h3> + <p>Rights in Wikidata are waived using <a href="https://creativecommons.org/publicdomain/zero/1.0/";>the Creative Commons Zero public domain dedication.</a></p> -<p>The Wikimedia Foundation Inc. does not hold copyright on any text -except where such text was produced by the Foundation.</p> - -<p>Image copyright information is contained in the image description page -inside the text dumps. Many images are NOT released under the GFDL; -these may be fair use or non-commercial images and their use may be -illegal outside Wikipedia or in a different context than they are used -on Wikipedia.</p> - -<p>Both the text and images are almost certain to contain some -copyright infringements which have not yet been noticed and removed. -Your use of this material is AT YOUR OWN RISK. Please let us know about -any copyright infringements you find, so they can be removed.</p> + <h3>Fair use and other exceptions</h3> +<p>Some text and images may be included when it is believed that this inclusion is permitted by <a href="http://en.wikipedia.org/wiki/Fair_use";>fair use</a> or other exceptions to copyright. A list (possibly incomplete) of <a href="https://meta.wikimedia.org/wiki/Non-free_content";>relevant exceptions and policies can be found on our meta-wiki</a>. Use of this information may be a copyright violation if used in a different context than they are used on Wikipedia.</p> + <h3>Potential infringements</h3> + <p>Wikimedians diligently remove copyright infringements, but because that removal is an ongoing process, these dumps may contain some copyright infringements which have not yet been noticed and removed. Your use of this material is AT YOUR OWN RISK. Please let us know about any copyright infringements you find, so they can be removed.</p> + <h2>More information: Legal</h2> + <p>For more information about our licensing policy, see: + <ul> + <li><a href="https://wikimediafoundation.org/wiki/Terms_of_Use#7._Licensing_of_Content";>Section 7 of our Terms of Use</a></li> + <li>Our <a href="https://wikimediafoundation.org/wiki/Resolution:Licensing_policy";>Licensing Policy</a></li> + <li>Per-project licensing information, such as <a href="https://en.wikipedia.org/wiki/Wikipedia:Licensing";>this description of English Wikipedia’s licensing policy.</a></li> + </ul> + <h2>More information: for researchers</h2> + <p>If you’re a researcher, you can find <a href="https://meta.wikimedia.org/wiki/Research:Data";>more information about our data sources</a> as part of our <a href="https://meta.wikimedia.org/wiki/Research:Index";>Research hub</a>.</p> + <h2>Questions?</h2> + <p>For questions, please contact le...@wikimedia.org.</p> + <div class="visualClear"></div> + </div> + </div> </body> </html> -- To view, visit https://gerrit.wikimedia.org/r/134121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7516d3c1fb65325eb45abc54f09b510227d55f4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: DarTar <dtarabore...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: LVilla (WMF) <lvi...@wikimedia.org> Gerrit-Reviewer: LuisVilla <lvi...@wikimedia.org> Gerrit-Reviewer: RobLa <ro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
