[MediaWiki-commits] [Gerrit] update legal terms for dumps.wm.o - change (operations/puppet)
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 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr">
+
-http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-
-Copyrights information
+
+ License information about Wikimedia dump
downloads
+ /*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;
+}
+
+/*]]>*/
+
-
-Copyright and license
-All original textual content except Wikinews original textual content is
-licensed under the http://www.wikipedia.org/wiki/Wikipedia:Copyrights"; title="Wikipedia
Copyrights">
-GNU Free Documentation License (GFDL) and the
-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. Some text may be available only under
the Creative Commons license; see our
-http://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use
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
-http://en.wikipedia.org/wiki/Fair_use";>Fair use for more
information.
+
+
+ License information
+ Wikimedia’s https://wikimediafoundation.org/wiki/Mission";>mission 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 http://dumps.wikimedia.org/";>dumps.wikimedia.org, this page contains
more detailed information about Wikimedia’s licensing and licensing policies as
they may apply to our dumps.
+ This
is a high-level guide only. Where this information conflicts with specific
information in the https://wikimediafound
[MediaWiki-commits] [Gerrit] update legal terms for dumps.wm.o - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134121
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(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/134121/1
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 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en" dir="ltr">
+
-http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-
-Copyrights information
+
+ License information about Wikimedia dump
downloads
+ /*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;
+}
+
+/*]]>*/
+
-
-Copyright and license
-All original textual content except Wikinews original textual content is
-licensed under the http://www.wikipedia.org/wiki/Wikipedia:Copyrights"; title="Wikipedia
Copyrights">
-GNU Free Documentation License (GFDL) and the
-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. Some text may be available only under
the Creative Commons license; see our
-http://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use
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
-http://en.wikipedia.org/wiki/Fair_use";>Fair use for more
information.
+
+
+ License information
+ Wikimedia’s https://wikimediafoundation.org/wiki/Mission";>mission 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 http://dumps.wikimedia.org/";>dumps.wikimedia.org, this page contains
more detailed information about Wikimedia’s licensing and licensing policies as
they may apply to our dumps.
+ This
is a high-level guide only. Where this information conflicts with specific
information in the https://wikimediafoundation.org/wik
