Prtksxna has submitted this change and it was merged.
Change subject: Content and style changes
......................................................................
Content and style changes
Change-Id: I682b034a8ef2495d112cafaff9544998c084b5ef
---
M source/content.html.erb
M source/faq.html.erb
M source/index.html.erb
M source/privacy.html.erb
M source/stylesheets/master.css.scss
5 files changed, 28 insertions(+), 24 deletions(-)
Approvals:
Prtksxna: Verified; Looks good to me, approved
diff --git a/source/content.html.erb b/source/content.html.erb
index 332e1d0..161ef14 100644
--- a/source/content.html.erb
+++ b/source/content.html.erb
@@ -38,7 +38,7 @@
</p>
<p>
- Below, you will find more information about the number of requests we
receive, where they come from, and how they could impact free knowledge. You
can also learn more about how we fight for freedom of speech through our user
assistance programs in the <a href="/faq">FAQ</a>.
+ Below, you will find more information about the number of requests we
receive, where they come from, and how they could impact free knowledge. You
can also learn more about how we fight for freedom of speech through our user
assistance programs in the <a href="/faq#information">FAQ</a>.
</p>
<blockquote>
@@ -79,7 +79,7 @@
Aboriginal Language<br>
<small>July 2012</small>
</h3>
- <p>An Tasmanian aboriginal language center demanded the removal of the <a
href="https://en.wikipedia.org/wiki/Palawa_kani";>English Wikipedia article on
"palawa kani"</a>, claiming copyright over the entirety of the language. We
refused to remove the article because copyright law simply cannot be used to
stop people from using an entire language or to prevent general discussion
about the language. Such a broad claim would have chilled free speech and
negatively impacted research, education, and public discourse — activities that
Wikimedia serves to promote.</p>
+ <p>A Tasmanian aboriginal language center demanded the removal of the <a
href="https://en.wikipedia.org/wiki/Palawa_kani";>English Wikipedia article on
"palawa kani"</a>, claiming copyright over the entirety of the language. We
refused to remove the article because copyright law simply cannot be used to
stop people from using an entire language or to prevent general discussion
about the language. Such a broad claim would have chilled free speech and
negatively impacted research, education, and public discourse—activities that
Wikimedia serves to promote.</p>
</div>
</div>
@@ -116,7 +116,7 @@
<p>A well-functioning copyright law carefully balances the interests of
the public in access to expressive works and... the interests of copyright
owners in being compensated for uses of their works.</p>
<footer>
<img src="/images/quote_samuelson.png">
- <p>Pamuela Samuelson<small>Director of Berkeley Center for Law &
Technology (2010)</small></p>
+ <p>Pamela Samuelson<small>Director of Berkeley Center for Law &
Technology (2010)</small></p>
</footer>
</blockquote>
</div>
@@ -124,11 +124,11 @@
<div class="col-md-4">
<div class="story">
<h3>
- Babe Ruth's "Called Shot"<br>
+ Babe Ruth's Called Shot<br>
<small>March 2014</small>
</h3>
<hr />
- <p>A film shot by Matt Kandle at the <a
href="https://en.wikipedia.org/wiki/1932_World_Series";>1932 World Series</a>
provides evidence of <a href="https://en.wikipedia.org/wiki/Babe_Ruth";>Babe
Ruth's</a> famous “<a
href="https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot";>called
shot</a>,” in which he gestured to center field before hitting a home run to
the same location. The copyright owner sent us a DMCA takedown request
regarding a still image from the film used on <a
href="https://en.wikipedia.org";>English Wikipedia</a>. We declined to remove
the image on the basis of <a href="https://en.wikipedia.org/wiki/Fair_use";>fair
use</a>, citing its extraordinary value in illustrating the famous moment and
the educational purpose it serves.</p>
+ <p>A film shot by Matt Kandle at the <a
href="https://en.wikipedia.org/wiki/1932_World_Series";>1932 World Series</a>
provides evidence of <a href="https://en.wikipedia.org/wiki/Babe_Ruth";>Babe
Ruth's</a> famous “<a
href="https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot";>called
shot</a>,” in which he gestured to center field before hitting a home run to
the same location. The copyright owner sent us a DMCA takedown request
regarding a <a
href="https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg";>still
image</a> from the film used on <a href="https://en.wikipedia.org";>English
Wikipedia</a>. We declined to remove the image on the basis of <a
href="https://en.wikipedia.org/wiki/Fair_use";>fair use</a>, citing its
extraordinary value in illustrating the famous moment and the educational
purpose it serves.</p>
</div>
</div>
@@ -150,7 +150,7 @@
<small>November 2013</small>
</h3>
<hr />
- <p>A publishing company sent us a takedown request concerning four famous
works on <a href="https://wikisource.org/";>Wikisource</a>: French translations
of <a href="https://en.wikipedia.org/wiki/Jane_Austen";>Jane Austen's</a> <a
href="http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet";>Pride and
Prejudice</a> and <a
href="http://fr.wikisource.org/wiki/Persuasion";>Persuasion</a>, a French
translation <a href="https://en.wikipedia.org/wiki/Arthur_Conan_Doyle";>Arthur
Conan Doyle's</a> <a
href="https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes";>The
Adventures of Sherlock Holmes</a>, and <a
href="https://en.wikipedia.org/wiki/Jean_de_la_Fontaine";>Jean de la
Fontaine’s</a> <a
href="http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III";>Fables</a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the public domain. When we alerted the company to this point, it
rescinded the takedown notice.</p>
+ <p>A publishing company sent us a takedown request concerning four famous
works on <a href="https://wikisource.org/";>Wikisource</a>: French translations
of <a href="https://en.wikipedia.org/wiki/Jane_Austen";>Jane Austen's</a> <a
href="http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet";><em>Pride
and Prejudice</em></a> and <a
href="http://fr.wikisource.org/wiki/Persuasion";><em>Persuasion</em></a>, a
French translation <a
href="https://en.wikipedia.org/wiki/Arthur_Conan_Doyle";>Arthur Conan
Doyle's</a> <a
href="https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes";><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href="https://en.wikipedia.org/wiki/Jean_de_la_Fontaine";>Jean de la
Fontaine’s</a> <a
href="http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III";><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href="https://en.wikipedia.org/wiki/Public_domain";>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>
</div>
</div>
diff --git a/source/faq.html.erb b/source/faq.html.erb
index e20f6a7..5ddbbf6 100644
--- a/source/faq.html.erb
+++ b/source/faq.html.erb
@@ -9,14 +9,14 @@
<div class="col-md-3"></div>
<div class="col-md-9">
- <h2>What sort of information gets requested?</h2>
+ <h2 id="#information">What sort of information gets requested?</h2>
<p>All sorts of identifying information, public and nonpublic, gets
requested. Requests tend to be broad in nature, in order to capture as much
information as possible. However, because we collect relatively <a
href="https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It";>small
amounts of information</a> and retain it for <a
href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>limited
amounts of time</a>, we frequently have little to disclose.</p>
- <h2>Does WMF have different standards depending on who is requesting?
</h2>
- <p>No. Regardless of who is requesting user data—be it an individual, a
government, or a law enforcement officer—we typically do not produce
information as a result of a request unless we have received proper legal
process. More information can be found in our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>Requests
for User Information Procedure & Guidelines</a>.</p>
+ <h2 id="#standard">Does WMF have different standards depending on who
is requesting? </h2>
+ <p>No. Regardless of who is requesting user data—be it an individual, a
government, or a law enforcement officer—we typically do not produce
information as a result of a request unless we have received proper legal
process. More information can be found in our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>Requests
for User Information Procedure & Guidelines</a>.</p>
<h2>What happens when you receive a request from abroad?</h2>
- <p>Per our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>Requests
for User Information Procedure & Guidelines</a>, we require that requests
originating from outside of the United States to follow the <a
href="https://en.wikipedia.org/wiki/Mutual_Legal_Assistance_Treaty";>mutual
legal assistance treaty</a> (MLAT) process or <a
href="https://en.wikipedia.org/wiki/Letter_rogatory";>letters rogatory</a>
process so that a U.S. court will issue the required U.S. legal process to the
Wikimedia Foundation.</p>
+ <p>Per our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>Requests
for User Information Procedure & Guidelines</a>, we require that requests
originating from outside of the United States to follow the <a
href="https://en.wikipedia.org/wiki/Mutual_Legal_Assistance_Treaty";>mutual
legal assistance treaty</a> (MLAT) process or <a
href="https://en.wikipedia.org/wiki/Letter_rogatory";>letters rogatory</a>
process so that a U.S. court will issue the required U.S. legal process to the
Wikimedia Foundation.</p>
<h2>When would you not tell a user that his or her nonpublic personal
information is being disclosed as a result of a legal process, such as a
subpoena? </h2>
<p>We are committed to notifying users if we plan on disclosing
nonpublic personal information. However, we cannot notify a user if we are
legally restrained from doing so (e.g. by a gag order), if a credible threat to
life or limb is present, or if the user has not provided us with an e-mail
address or valid contact information.</p>
@@ -72,7 +72,7 @@
<p>In the unlikely event that you are the subject of a lawsuit, it is
highly recommended that you consult your own lawyer. There are a number of
organizations that fight on a user's behalf, like the <a
href="http://www.casp.net/";>California Anti-SLAPP Project</a> or the <a
href="https://www.eff.org/";>Electronic Frontier Foundation</a> (EFF). If you
need help finding an attorney, WMF may be able to put you in touch with some of
these organizations or help you secure an attorney at reduced or pro-bono
rates. Additionally, in rare cases, assistance may also be available under our
<a
href="https://meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Fees_Assistance_Program";>Legal
Fees Assistance Program</a> or <a
href="https://meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Policies#Defense_of_Contributors";>Defense
of Contributors Program</a>.</p>
<h2>Does WMF ever remove content?</h2>
- <p>Absent the receipt of a legally valid DMCA notice, the Wikimedia
Foundation will generally only remove content in exceptional circumstances.</p>
+ <p>Absent the receipt of a legally valid <a
href="http://www.chillingeffects.org/dmca512/faq.cgi#QID130";>DMCA notice</a>,
the Wikimedia Foundation will generally only remove content in exceptional
circumstances.</p>
<h2>What makes a DMCA takedown notice "valid" or "proper"?</h2>
<p>The DMCA has several <a
href="https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner";>formal
requirements</a> for notices. However, our evaluation isn’t over when we
receive a notice that meets all of these requirements. We will also analyze the
copyright eligibility of the work being infringed, whether the allegedly
infringing material actually infringes, and whether the allegedly infringing
material is a <a href="https://en.wikipedia.org/wiki/Fair_use";>fair use</a> of
the requester’s work. For more information, see our <a
href="http://wikimediafoundation.org/wiki/DMCA_Policy";>DMCA Policy</a>.</p>
diff --git a/source/index.html.erb b/source/index.html.erb
index b294134..eaba838 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -17,7 +17,7 @@
</div>
<div class="col-md-4">
- <a href="privacy/" class="story">
+ <a href="privacy/" class="story bignav">
<h3>Requests for <br />User Data</h3>
<hr/>
<p>
@@ -27,7 +27,7 @@
</div>
<div class="col-md-4">
- <a href="content/" class="story">
+ <a href="content/" class="story bignav">
<h3>Requests for Content Alteration & Takedown</h3>
<hr/>
<p>
@@ -37,7 +37,7 @@
</div>
<div class="col-md-4">
- <a href="faq/" class="story">
+ <a href="faq/" class="story bignav">
<h3>Frequently Asked<br />Questions</h3>
<hr/>
<p>
diff --git a/source/privacy.html.erb b/source/privacy.html.erb
index d180375..0948cfd 100644
--- a/source/privacy.html.erb
+++ b/source/privacy.html.erb
@@ -28,10 +28,10 @@
<div class="col-md-8">
<p class="lead">
- <a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech";>Freedom
of speech is essential</a> to the Wikimedia movement — our projects cannot
flourish in an ecosystem where individuals cannot speak freely. Our users trust
us to protect their identities against unlawful disclosure and we take this
responsibility seriously.
+ <a
href="https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech";>Freedom
of speech is essential</a> to the Wikimedia movement—our projects cannot
flourish in an ecosystem where individuals cannot speak freely. Our users trust
us to protect their identities against unlawful disclosure and we take this
responsibility seriously.
</p>
- <p>However, every year, governments, individuals, and corporations ask
us to disclose user data. Often, we have no nonpublic information to disclose
because we <a
href="https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It";>collect
little nonpublic information</a> about users and retain that information for a
<a href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>short
period of time</a>. But when we do have data, we carefully evaluate every
request before considering disclosure. If the requests do not meet our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>standards</a>
— if they are overly broad, unclear, or irrelevant—we will push back on behalf
of our users.</p>
+ <p>However, every year, governments, individuals, and corporations ask
us to disclose user data. Often, we have no nonpublic information to disclose
because we <a
href="https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It";>collect
little nonpublic information</a> about users and retain that information for a
<a href="https://meta.wikimedia.org/wiki/Data_retention_guidelines";>short
period of time</a>. But when we do have data, we carefully evaluate every
request before considering disclosure. If the requests do not meet our <a
href="https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines";>standards</a>—if
they are overly broad, unclear, or irrelevant—we will push back on behalf of
our users.</p>
<p>If we must produce information due to a legally valid request, we
will notify the affected user before we disclose, if we are legally permitted
and have the means to do so. In certain cases, we may help find assistance for
users to fight an invalid request.</p>
@@ -41,13 +41,13 @@
<p>Man is least himself when he talks in his own person. Give
him a mask, and he will tell you the truth.</p>
<footer>
<img src="/images/quote_wilde.png">
- <p>Oscar Wilde, Writer & Poet (1891)</p>
+ <p>Oscar Wilde <small>Writer & Poet
(1891)</small></p>
</footer>
</blockquote>
<div id="summary_table" class="story">
<h3>
- <small>July 2012 - June 2014</small><br />
+ <small>July 2012 – June 2014</small><br />
Summary
</h3>
<hr />
@@ -69,15 +69,15 @@
<td>15</td>
</tr>
<tr>
- <td>Civil Subpoenas</td>
+ <td><a href="#">Civil Subpoenas</a></td>
<td>8</td>
</tr>
<tr>
- <td>Criminal Subpoena</td>
+ <td><a href="#">Criminal Subpoenas</a></td>
<td>5</td>
</tr>
<tr>
- <td>Administrative Subpoena</td>
+ <td>Administrative Subpoenas</td>
<td>0</td>
</tr>
<tr>
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index 02ce93e..0f58683 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -153,6 +153,11 @@
}
}
+ &.bignav {
+ margin-top: 40px;
+ margin-bottom: 20px;
+ }
+
p {
margin: 20px 16px 14px;
}
@@ -219,12 +224,11 @@
margin-top: 25px;
margin-left: 170px;
color: $gray;
- text-transform: uppercase;
small {
- display: inline;
+ display: block;
text-transform: none;
- margin-left: 10px;
+ font-style: italic;
&:before {
content: '';
--
To view, visit https://gerrit.wikimedia.org/r/151002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I682b034a8ef2495d112cafaff9544998c084b5ef
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: MSyed <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"](https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"){kind=link}