Merge pull request #1695 from zz9pzza/issue_4007_take2

Most archives should be Archives ( unless they are not the AO3)

app/views/home/_tos.html.erb

@@ -1,6 +1,6 @@
 <div class="notice">
 	<p class="important"><strong>While the Archive is in beta, it's important for users to be aware of what that means:</strong></p>
-  <p>We are making every effort to make the archive stable and useful. However, part of that effort is testing the archive, and your contributions are part of the test. Therefore, be advised: the archive or parts of the archive may break! Content may be lost! Features may not work! Administrators will just be getting the hang of administration! Please report bugs, and don't use the beta version of the archive as your only place to store your stories.</p>
+  <p>We are making every effort to make the Archive stable and useful. However, part of that effort is testing the Archive, and your contributions are part of the test. Therefore, be advised: the Archive or parts of the Archive may break! Content may be lost! Features may not work! Administrators will just be getting the hang of administration! Please report bugs, and don't use the beta version of the Archive as your only place to store your stories.</p>
 	<p>This is a work in progress. We appreciate your forbearance and your willingness to be a part of the Archive at this early stage. Thank you!</p>
 </div>
 
@@ -293,7 +293,7 @@
     <li> <a name="IV.K.1">Introduction</a>
       <ol style="list-style-type:lower-alpha;">
         <li><strong>We will not require specific ratings or warnings. However, a creator who chooses not to use ratings or warnings on a fanwork must signal this choice </strong> (<a href="/tos_faq#ratings_and_warnings">refer to the ToS FAQ</a>). </li>
-        <li>By default, all users will see the archive warnings and tags the creator has selected. Any logged-in user who wishes to avoid archive warnings and tags may set preferences to hide them by default. Logged-in users who set their preferences to hide information are proceeding at their own risk and may be exposed to content they would otherwise wish to avoid. Such users may change their preferences, or reveal information for specific stories, at any time. </li>
+        <li>By default, all users will see the Archive warnings and tags the creator has selected. Any logged-in user who wishes to avoid Archive warnings and tags may set preferences to hide them by default. Logged-in users who set their preferences to hide information are proceeding at their own risk and may be exposed to content they would otherwise wish to avoid. Such users may change their preferences, or reveal information for specific stories, at any time. </li>
         <li>Logged-in users may set their preferences to indicate that they are willing to see mature or explicit content. </li>
         <li>Other users, including users who are not registered users of the site, who follow a link to a fanwork rated mature, explicit, or "not rated," will be asked to agree to see mature, explicit, or unrated content. The Archive software will remember a non-registered user's choice during that user's visit, but will not retain the setting for future visits. </li>
       </ol>
@@ -326,22 +326,22 @@
           <p>General description:</p>
           <p>There are two components to warnings on the Archive.</p>
           <ol style="list-style-type:lower-roman;">
-            <li>Archive warnings: Creators can select from a <%= link_to 'list of archive warnings', tos_faq_path(:anchor => 'tags') %>. The list also allows creators to select "choose not to use archive warnings" and "none of these warnings apply," or equivalent text as specified on the creator upload form.</li>
-            <li>Secondary (optional or additional) tags, including warnings: Creators can define their own tags, as seriously or as humorously as they like. These can include specific content warnings. The warnings policy only covers <%= link_to 'archive warnings', tos_faq_path(:anchor => 'tags') %>.</li>
+            <li>Archive warnings: Creators can select from a <%= link_to 'list of Archive warnings', tos_faq_path(:anchor => 'tags') %>. The list also allows creators to select "choose not to use Archive warnings" and "none of these warnings apply," or equivalent text as specified on the creator upload form.</li>
+            <li>Secondary (optional or additional) tags, including warnings: Creators can define their own tags, as seriously or as humorously as they like. These can include specific content warnings. The warnings policy only covers <%= link_to 'Archive warnings', tos_faq_path(:anchor => 'tags') %>.</li>
           </ol>
         </li>
         <li>
           <p>As a rule, the creator controls the warnings.</p>
-          <p>Selecting "choose not to use archive warnings," or the equivalent text as specified on the creator upload form, satisfies a creator's obligation under the warnings policy. If a fanwork uses this option, we will not sustain any failure-to-warn complaints. If the abuse team receives a failure-to-warn complaint in other circumstances, the abuse team may decide the absence of a specific archive warning is misleading.  In such cases, the creator may be asked to add a warning or to select the choose not to warn option. If the creator declines or fails to respond, the abuse team may hide the work, set the warning to indicate that the creator has chosen not to warn, or take any other appropriate action, but it will not select any other warning.</p>
+          <p>Selecting "choose not to use Archive warnings," or the equivalent text as specified on the creator upload form, satisfies a creator's obligation under the warnings policy. If a fanwork uses this option, we will not sustain any failure-to-warn complaints. If the abuse team receives a failure-to-warn complaint in other circumstances, the abuse team may decide the absence of a specific Archive warning is misleading.  In such cases, the creator may be asked to add a warning or to select the choose not to warn option. If the creator declines or fails to respond, the abuse team may hide the work, set the warning to indicate that the creator has chosen not to warn, or take any other appropriate action, but it will not select any other warning.</p>
         </li>
         <li>
-          <p>The meaning of "choose not to use archive warnings" or equivalent text:</p>
-          <p>The fanwork may or may not contain any of the subject matter on the archive list. Users who wish to avoid specific elements entirely should not access fanworks marked with "choose not to use archive warnings." A creator can select both "choose not to use archive warnings" and one of the archive warnings in order to warn for some but not all of the archive warnings.</p>
+          <p>The meaning of "choose not to use Archive warnings" or equivalent text:</p>
+          <p>The fanwork may or may not contain any of the subject matter on the Archive list. Users who wish to avoid specific elements entirely should not access fanworks marked with "choose not to use Archive warnings." A creator can select both "choose not to use Archive warnings" and one of the Archive warnings in order to warn for some but not all of the Archive warnings.</p>
         </li>
       </ol>
     </li>
-    <li> <a name="IV.K.4">Consequence of failure to use an appropriate rating or archive warning</a>
-      <p>In general, failure to use an appropriate rating or archive warning is not a violation of the abuse policy.</p>
+    <li> <a name="IV.K.4">Consequence of failure to use an appropriate rating or Archive warning</a>
+      <p>In general, failure to use an appropriate rating or Archive warning is not a violation of the abuse policy.</p>
       <p>It is our policy to defer to creators' categorizations, but we reserve the right to recategorize a fanwork in the situations described above.</p>
       <p>A recategorization decision is appealable through the ordinary abuse appeals process.</p>
       <p>A recategorization of a fanwork will not result in suspension of a user's account, unless it is a repeated pattern for a single user, in which case it may be treated as grounds for a suspension. Moreover, if a creator unilaterally reverses a recategorization, without agreement from the abuse team, that will be treated as grounds for a suspension.</p>
@@ -380,7 +380,7 @@
       <p>In order to implement certain types of collections, the Archive may allow works to be posted which will not be generally visible until a time set by the collection maintainer.</p>
       <ol style="list-style-type:lower-alpha;">
         <li>Once posted, the work will be visible to administrators (including members of the abuse team for purposes of resolving complaints), co-creators (if any), and the maintainers of any collection of which the work is a part.</li>
-        <li>If the collection of which a work is a part specifies rules regarding time of general visibility, the collection maintainer may be able to control the time at which a work becomes generally visible to archive users.</li>
+        <li>If the collection of which a work is a part specifies rules regarding time of general visibility, the collection maintainer may be able to control the time at which a work becomes generally visible to Archive users.</li>
       </ol>
     </li>
     <li>
@@ -389,15 +389,15 @@
   </ol>
 
   <h5 class="heading"><a name="V.B.">B. Fannish next-of-kin</a></h5>
-  <p>Registered archive users may designate a fannish next-of-kin. A next-of-kin agreement allows the transfer of content maintenance in the case of a user's permanent incapacitation or death.</p>
+  <p>Registered Archive users may designate a fannish next-of-kin. A next-of-kin agreement allows the transfer of content maintenance in the case of a user's permanent incapacitation or death.</p>
   <p>Both parties to the agreement must be registered users of the Archive.</p>
   <p>The Archive's role in this agreement is only to act as a facilitator. If the person designated as the fannish next-of-kin activates the agreement by sending a message to the Archive, the Archive will not do any independent investigation to confirm the necessity for the transfer.</p>
-  <p>A fannish next-of-kin agreement is confidential and accessible only by designated members of the archive team, who may only use it for purposes of implementing the agreement.</p>
+  <p>A fannish next-of-kin agreement is confidential and accessible only by designated members of the Archive team, who may only use it for purposes of implementing the agreement.</p>
 
   <h5 class="heading"><a name="V.C.">C. Orphaning Works</a></h5>
   <ol style="list-style-type:decimal;">
     <li>Definition of orphaning
-      <p>One of the goals of the OTW and the Archive is to provide a permanent long-term home for fanworks. We also understand that circumstances can arise in which creators wish to remove their stories from the internet or otherwise dissociate themselves from their work. Our archive software gives creators the ability to anonymize or orphan fanworks along with the option of deleting them from the archive. For a more detailed description of orphaning, please see <%= link_to 'About Orphaning', about_orphans_path %>.</p>
+      <p>One of the goals of the OTW and the Archive is to provide a permanent long-term home for fanworks. We also understand that circumstances can arise in which creators wish to remove their stories from the internet or otherwise dissociate themselves from their work. Our Archive software gives creators the ability to anonymize or orphan fanworks along with the option of deleting them from the Archive. For a more detailed description of orphaning, please see <%= link_to 'About Orphaning', about_orphans_path %>.</p>
     </li>
     <li>User-controlled orphaning
       <p>Users will have the ability to delete or orphan their works themselves as long as they have a valid account. Users are responsible for saving their account passwords and keeping their e-mail addresses up to date. Users will be able to have passwords e-mailed to them and to change the e-mail addresses associated with accounts. However, a user who has lost a password and has no access to the e-mail associated with the account may be unable to access the account for any purpose, including orphaning or deletion, unless the user can verify identity in some other way, as described below.</p>
@@ -425,7 +425,7 @@
   <h6 class="heading">ToS for Open Doors projects</h6>
   <ol style="list-style-type:decimal;">
     <li>Maintainer Consent
-      <p>The OTW will only preserve collections with the full consent of the maintainer of the collection. The current maintainer of the project must agree to the Open Doors ToS and agree to grant us access to a copy of the current contents of the collection. The maintainer must also transfer ownership of the domain name (if any) if they want URL redirects, and if such redirects are possible. (Domain name transfer is not necessary if the maintainer is merely backing up an archive within the Archive of Our Own.)</p>
+      <p>The OTW will only preserve collections with the full consent of the maintainer of the collection. The current maintainer of the project must agree to the Open Doors ToS and agree to grant us access to a copy of the current contents of the collection. The maintainer must also transfer ownership of the domain name (if any) if they want URL redirects, and if such redirects are possible. (Domain name transfer is not necessary if the maintainer is merely backing up an Archive within the Archive of Our Own.)</p>
     </li>
     <li>Transfer of Project
       <p>When the board of the OTW and the current owner of the collection have decided to bring on an archive or a special collection under the Open Doors project, the current owner will provide a copy of the current contents (either manually or by giving Systems access to the existing site) and transfer ownership of the existing domain name to the OTW (if they want redirects; again, domain name transfer is not necessary if the maintainer is merely backing up the archive within the Archive of Our Own).</p>
@@ -445,7 +445,7 @@
       <p>If the collection's maintainer no longer wants to work on the collection, the OTW will find someone else in the organization to keep the collection up and running, and potentially growing into the future.</p>
     </li>
     <li>Collection Policy
-      <p>Where possible, the existing policies of the collection will be preserved, even if they differ from the policies of the Archive of Our Own. Specifically, collections (whether integrated into the Archive of Our Own or preserved as special collections) can have limits on fandom, subject matter, sexual content, etc. that do not apply to archive content generally. Open Doors collections may be mixed fan and non-fanworks; when we accept a mixed collection, the entire collection will be added to the Archive, and the standard prohibition on non-fanworks will not apply to the collection. However, the OTW retains the right to remove content from its servers if the Board deems removal necessary for specific legal reasons, or if the content violates the Content Policy (other than the prohibition on non-fanwork content).</p>
+      <p>Where possible, the existing policies of the collection will be preserved, even if they differ from the policies of the Archive of Our Own. Specifically, collections (whether integrated into the Archive of Our Own or preserved as special collections) can have limits on fandom, subject matter, sexual content, etc. that do not apply to Archive content generally. Open Doors collections may be mixed fan and non-fanworks; when we accept a mixed collection, the entire collection will be added to the Archive, and the standard prohibition on non-fanworks will not apply to the collection. However, the OTW retains the right to remove content from its servers if the Board deems removal necessary for specific legal reasons, or if the content violates the Content Policy (other than the prohibition on non-fanwork content).</p>
       <p>Control over individual fanworks contained within a collection rests with their creators. If the creator of any individual fanwork contained within a collection requests its removal or alteration, the OTW will always comply with such a request. We will also provide mechanisms allowing creators to claim their fanworks from such a collection and if desired to attach them to a new or existing Archive of Our Own account.</p>
     </li>
     <li>Parting from the OTW