Spruce up rules

classes/rules.class.php

@@ -27,15 +27,15 @@ class Rules {
   public static function display_site_tag_rules($OnUpload = false) {
     ?>
     <ul>
-      <li>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag&#8202;&mdash;&#8202;e.g. "<strong class="important_text_alt">big.breasts</strong>".</li>
+      <li>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag &mdash; e.g. "<strong class="important_text_alt">big.breasts</strong>".</li>
 
       <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>. Please use these tags instead of "unofficial" tags (e.g. use the official "<strong class="important_text_alt">paizuri</strong>" tag, instead of an unofficial "<strong class="important_text">titfuck</strong>" tag).</strong></li>
 
-      <li>Avoid using multiple synonymous tags. Using both "<strong class="important_text">pissing</strong>" and "<strong class="important_text_alt">urination</strong>" is redundant and stupid&#8202;&mdash;&#8202;just use the official "<strong class="important_text_alt">urination</strong>" tag.</li>
+      <li>Avoid using multiple synonymous tags. Using both "<strong class="important_text">pissing</strong>" and "<strong class="important_text_alt">urination</strong>" is redundant and stupid &mdash; just use the official "<strong class="important_text_alt">urination</strong>" tag.</li>
 
       <li>Do not add useless tags that are already covered by other metadata. If a torrent is in the JAV category, it should not be tagged <strong class="important_text">jav</strong>.</li>
 
-      <li>Only tag information on the title itself&#8202;&mdash;&#8202;<strong>not the individual release</strong>. Tags such as "<strong class="important_text">mkv</strong>", "<strong class="important_text">windows</strong>", "<strong class="important_text">scan</strong>", "<strong class="important_text">from.dlsite</strong>", etc. are strictly forbidden. Remember that these tags will be used for other versions of the same title.</li>
+      <li>Only tag information related to the group itself &mdash; <strong>not the individual release</strong>. Tags such as "<strong class="important_text">mkv</strong>", "<strong class="important_text">windows</strong>", "<strong class="important_text">scan</strong>", "<strong class="important_text">from.dlsite</strong>", etc. are strictly forbidden. Remember that these tags will be used for other releases in the same group.</li>
 
       <li>Derivative works may be tagged with the name of the parent series or characters within the work. For example, tags such as "<strong class="tag_parody">touhou</strong>" or "<strong class="tag_character">iori.minase</strong>" may be acceptable if they are being used on derivative (parody) works. These kinds of tags should NOT be used if the series is primarily erotic in nature. Characters should be tagged with the form "<strong class="important_text_alt">surname.firstname</strong>" if applicable.</li>
 
@@ -49,16 +49,16 @@ class Rules {
 
       <li><strong>Use tag namespaces when appropriate.</strong> Oppaitime allows for tag namespaces to aid with searching. For example, you may want to use the tags "<strong class="important_text_alt">masturbation:male</strong>" or "<strong class="important_text_alt">masturbation:female</strong>" instead of just "<strong class="important_text">masturbation</strong>". They can be used to make search queries more specific. Searching for "<strong class="important_texti_alt">masturbation</strong>" will show all torrents tagged with "<strong class="important_text_alt">masturbation</strong>", "<strong class="important_text_alt">masturbation:male</strong>", or "<strong class="important_text_alt">masturbation:female</strong>". However, searching for "<strong class="important_text_alt">masturbation:female</strong>" will ONLY show torrents with that tag. Tags with namespaces will appear differently depending on the namespace used, which include:
         <ul>
-          <li><strong>:parody<strong> - Used to denote a parodied work: <strong class="tag_parody">touhou</strong>, <strong class="tag_parody">kantai.collection</strong></li>
+          <li><strong>:parody</strong> - Used to denote a parodied work: <strong class="tag_parody">touhou</strong>, <strong class="tag_parody">kantai.collection</strong></li>
           <li><strong>:character</strong> - Used to denote a character in a parodied work: <strong class="tag_character">iori.minase</strong>, <strong class="tag_character">hakurei.reimu</strong></li>
           <li><strong>:male</strong> - Used to denote that the tag refers to a male character: <strong class="tag_male">masturbation</strong>, <strong class="tag_male">teacher</strong></li>
           <li><strong>:female</strong> - Used to denote that the tag refers to a female character: <strong class="tag_female">masturbation</strong>, <strong class="tag_female">shaved</strong></li>
         </ul>
       </li>
 
-      <li><strong>All uploads require a minimum of 5 tags.</strong></li>
+      <li><strong>All uploads require a minimum of 5 tags.</strong> Do not add unrelated tags just to meet the 5 tag requirement. If you can't think of 5 tags for your content, watch/read/play through it again until you can.</li>
 
-      <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>. If you are in any doubt about whether or not a tag is acceptable, do not add it.</strong></li>
+      <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong> If you are in any doubt about whether or not a tag is acceptable, do not add it.</li>
     </ul>
 <?
   }
@@ -70,69 +70,20 @@ class Rules {
   public static function display_forum_rules() {
     ?>
     <ol>
-      <li>
-        Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.
-      </li>
-      <li>
-        Don't use all capital letters, excessive !!! (exclamation marks) or ??? (question marks) unless it's funny. Basically just don't type like a disgusting fucking normie.
-      </li>
-      <li>
-        No lame referral schemes. This includes freeipods.com, freepsps.com, or any other similar scheme in which the poster gets personal gain from users clicking a link. This shit is the WORST and you WILL be permanently banned on the spot, no questions asked you douche.
-      </li>
-      <li>
-        No asking for money for any reason whatsoever. We don't know or care about your friend who lost everything, or dying relative who wants to enjoy their last few moments alive by being given lots of money. The only ones allowed to shill around these parts are staff.
-      </li>
-      <li>
-        Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread, but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the title itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or being called a faggot.
-      </li>
-      <li>
-        No posting requests in forums. There's a request link at the top of the page for a god damn reason.
-      </li>
-      <li>
-        No flaming unless they <i>really</i> deserve it. Feel free to use offensive language, but don't be confrontational for the sake of confrontation.
-      </li>
-      <li>
-        Don't point out or attack other members' share ratios. A higher ratio totally makes you better than other people, though.
-      </li>
-      <li>
-        Asking stupid questions will probably result in you being made fun of. A stupid question is one that you could have found the answer to yourself with a little research, or one that you're asking in the wrong place. If you do the basic research suggested (i.e., read the rules/wiki) or search the forums and don't find the answer to your question, then go ahead and ask. Staff and First Line Support (FLS) are not here to hand-feed you the answers you could have found on your own with a little bit of effort. Apply yourself. Put <i>some</i> effort in.
-      </li>
-      <li>
-        Be sure you read all the sticky threads in a forum before you post. Let's be honest, we both know you're not going to do this.
-      </li>
-      <li>
-        Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom" relate to a topic they care about.
-      </li>
-      <li>
-        Don't post comments that don't add anything to the discussion. If you don't have anything valuable to say, don't say anything. When you're just cruising through a thread in a leisurely manner, it's not too annoying to read through a lot of "hear, hear"'s and "I agree"'s. But if you're actually trying to find information, it's a pain in the ass. So save those one-word responses for threads that have degenerated to the point where none but true aficionados are following them any more.
-        <p>
-          Or short: NO spamming, unless it's funny.
-        </p>
-      </li>
-      <li>
-        Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary. This includes quoting pictures! Don't quote the entire first post, either. I swear to god if I see you doing this it's over.
-      </li>
-      <li>
-        Feel free to request and discuss cracks for games and software. Links are fine, but if they're found to be malicious, the fire's gonna be under <i>your</i> ass.
-      </li>
-      <li>
-        Political or religious discussions are okay. These types of discussions lead to arguments and flaming users, which can be pretty funny to watch and gives staff a good excuse to ban people.
-      </li>
-      <li>
-        Don't waste other people's bandwidth by posting images with a large file size.
-      </li>
-      <li>
-        Be (a little) patient with newcomers. Once you have become an expert, it is easy to forget that you started out as a dumbass too.
-      </li>
-      <li>
-        Requesting invites to other sites is probably fine unless you're being obnoxious about it. Invites may be formally <strong>offered</strong> in the invite forum, and nowhere else.
-      </li>
-      <li>
-        No language other than English (and Japanese, when relevant) is permitted in the forums. If we can't understand it, we will assume you're calling our mothers whores.
-      </li>
-      <li>
-        Mature and graphic content on the forums and IRC is acceptable. In fact, it's expected. This is a porn site. Pictures of spiderman are prohibited.
-      </li>
+      <li>Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.</li>
+      <li>No commercial advertising or referral schemes. This includes any scheme in which the poster gets personal gain from users clicking a link. You will be immediately banned for this, no questions asked.</li>
+      <li>No asking for money for any reason whatsoever. We don't know or care about your friend who lost everything, or dying relative who wants to enjoy their last few moments alive by being given lots of money.</li>
+      <li>Do not inappropriately advertise your uploads. In special cases, it is acceptable to mention new uploads in an approved thread, but be sure to carefully read the thread's rules before posting. It is also acceptable to discuss releases you have uploaded when conversing about the title itself. Blatant attempts to advertise your uploads outside of the appropriate forums or threads may result in a warning or loss of privileges.</li>
+      <li>No posting requests in forums. There's a requests link at the top of the page for a reason.</li>
+      <li>Be sure you read all the sticky threads in a forum before you post.</li>
+      <li>Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom" relate to a topic they care about.</li>
+      <li>Don't post comments that don't add anything to the discussion. This generally includes any post without its own substance, such as "I agree" or "haha". These kinds of posts are annoying to people who are trying to actually find some information in a thread.</li>
+      <li>Refrain from quoting excessively. When quoting someone, use only the portion of the quote that is absolutely necessary.</li>
+      <li>Do not post any potentially malicious links without sufficient warning.</li>
+      <li>Don't waste other people's bandwidth by posting images with a large file size.</li>
+      <li>Only offer or request invites to other trackers in designated forums. If you can't find the invite forum, it's because you don't have access to it and should not post about it.</li>
+      <li>No language other than English (and Japanese, when relevant) is permitted in the forums.</li>
+      <li>Some things that <em>are</em> allowed include mature and graphic content, political and religious discussions, and insults. You are welcome to express whatever inflammatory opinions you want as long as you don't go overboard with it.</li>
     </ol>
 <?
   }
@@ -144,23 +95,19 @@ class Rules {
   public static function display_irc_chat_rules() {
     ?>
     <ol>
-      <li>Staff have the final decision. If a staff member says stop and you continue, expect to be called a faggot.</li>
-      <li>Be respectful to IRC Operators and Administrators. These people are site staff who do it for FREE. They are here for the benefit of all and to aid in conflict resolution. They enjoy Hot Pockets.</li>
-      <li>Do not link shock sites without a warning (unless it's funny). If in doubt, ask a staff member in <?=(BOT_HELP_CHAN)?> about it.</li>
-      <li>Excessive swearing will not get you kicked; practice being a sailor.</li>
+      <li>Staff have the final decision. If a staff member says stop and you continue, expect repercussions.</li>
       <li>Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked.</li>
-      <li>No arguing. You can't win an argument <s>over the Internet</s> because you're probably a dumbass, so you're just wasting your time trying.</li>
       <li>No opinions, especially related to race, religion, politics, etc are allowed. Failure to comply with a request to cease having an opinion WILL be considered a thoughtcrime and you WILL be reeducated.</li>
-      <li>Flooding is irritating and will warrant you a kick if it isn't funny enough or if an admin is cranky. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
-      <li>Impersonation of other members&#8202;&mdash;&#8202;particularly staff members&#8202;&mdash;&#8202;will not go unpunished. If you are uncertain of a user's identity, check their vhost, and then continue to be uncertain of their identity.</li>
+      <li>Flooding is irritating and will warrant you a kick if it isn't funny enough or if an admin is cranky. This includes, but is not limited to, automatic "now playing" scripts, pasting large amounts of irrelevant text, and multiple consecutive lines with no relevance to the conversation at hand.</li>
+      <li>Impersonation of other members &mdash; particularly staff members &mdash; will not go unpunished. If you are uncertain of a user's identity, check their vhost</li>
       <li>Spamming is <b>strictly</b> forbidden unless it's funny. This includes, but is not limited to, personal sites, online auctions, and cans of blended meat.</li>
-      <li>Obsessive annoyance&#8202;&mdash;&#8202;both to other users and staff&#8202;&mdash;&#8202;will not be tolerated.</li>
+      <li>Obsessive annoyance &mdash; both to other users and staff &mdash; will not be tolerated.</li>
       <li>Do not PM, DCC, or Query anyone you don't know or have never talked to without asking first; this applies specifically to staff.</li>
-      <li>No language other than English is permitted in the official IRC channels. If you can't use a real language, just stay in your shithole country.</li>
-      <li>The offering, selling, trading, and giving away of invites to this or any other site on our IRC network is <strong>strictly whatever</strong>.</li>
+      <li>No language other than English is permitted in the official IRC channels.</li>
       <li>Bots are not permitted in official channels with the exception of <strong>#oppaitime-announce</strong> and <strong>#oppaitime-requests</strong>.</li>
       <li>Any bots you have on IRC should authenticate with Udon using your own username and IRC key</li>
       <li>Bots must identify themselves by setting the +B usermode on themselves.</li>
+      <li>Unofficial channels are <em>not</em> policed by staff. Any content or discussion that goes on in unofficial channels shoud be treated as part of an unrelated public irc network.</li>
       <li><strong>Read the channel topic before asking questions.</strong></li>
     </ol>
 <?

sections/rules/clients.php

@@ -19,12 +19,10 @@ if (!$WhitelistedClients = $Cache->get_value('whitelisted_clients')) {
     <p>Client rules are how we maintain the integrity of our swarms. This allows us to filter out disruptive and dishonest clients that may hurt the performance of either the tracker or individual peers.</p>
     <table cellpadding="5" cellspacing="1" border="0" class="border" width="100%">
       <tr class="colhead">
-        <td style="width: 150px;"><strong>Allowed Client</strong></td>
-        <!-- td style="width: 400px;"><strong>Additional Notes</strong></td> -->
+        <td style="width: 150px;"><strong>Allowed Clients</strong></td>
       </tr>
 <?
   foreach ($WhitelistedClients as $Client) {
-    //list($ClientName, $Notes) = $Client;
     list($ClientName) = $Client;
 ?>
       <tr class="row">
@@ -40,16 +38,10 @@ if (!$WhitelistedClients = $Cache->get_value('whitelisted_clients')) {
       The modification of clients to bypass our client requirements (spoofing) is explicitly forbidden. People caught doing this will be instantly and permanently banned. When you leak peers, everyone loses. This is your only warning.
     </p>
     <p>
-      The use of clients or proxies which have been modified to report incorrect stats to the tracker (cheating) is not allowed, and will result in a permanent ban. Feel free to keep doing it on other trackers, though. That's their problem.
+      The use of clients or proxies which have been modified to report incorrect stats to our tracker (cheating) is not allowed, and will result in a permanent ban.
     </p>
     <p>
-      The testing of unstable clients by developers is not allowed unless approved by a staff member.
-    </p>
-  </div>
-  <h3>Further Details</h3>
-  <div class="box pad rule_summary">
-    <p>
-      If someone you invited to the site breaks the above rules you will receive a 2 month warning and lose the right to invite people to this site.
+      The testing of unstable clients by developers must first be approved by staff.
     </p>
   </div>
 <? include('jump.php'); ?>

sections/rules/collages.php

@@ -8,9 +8,6 @@ View::show_header('Collection Rules');
   </div>
   <div class="box pad rule_summary" style="padding: 10px 10px 10px 20px;">
     <ul>
-      <li>
-      Collections in the Personal and Theme categories may be based on opinion. You must respect others' opinions whilst creating and populating Theme collections.
-      </li>
       <li>
       Collection vandalism is taken very seriously, resulting in collection editing privileges being removed (at a minimum).
       </li>
@@ -21,7 +18,7 @@ View::show_header('Collection Rules');
       A well-defined group of people, for instance Titty Monsters, or Interviewers, may create a Group Picks Theme collection with one pick per person, after having gained permission for the collection from Staff.
       </li>
       <li>
-      There may only be one collection per Theme. Dupe collections will be deleted.
+      There may only be one collection per Theme. Dupe collections will be deleted. The collection that is allowed to stay will be determined at staff discretion, with priority given to the most well maintained and oldest collection.
       </li>
       <li>
       Theme collections must be sensible, and reasonably broad. Those that do not fit this description will be deleted.

sections/rules/ratio.php

@@ -40,7 +40,7 @@ View::show_header('Ratio Requirements');
       <br />
       <table class="ratio_table">
         <tr class="colhead">
-          <td class="tooltip" title="These units are actually in base 2, not base 10. For example, there are 1,024 MB in 1 GB.">Amount Downloaded</td>
+          <td class="tooltip" title="These units are in base 2, not base 10. For example, there are 1,024 MiB in 1 GiB.">Amount Downloaded</td>
           <td>Required Ratio (0% seeded)</td>
           <td>Required Ratio (100% seeded)</td>
         </tr>
@@ -117,8 +117,7 @@ $GB = 1024*1024*1024;
         <br />
         <br />
         <div style="text-align: center;">
-          <img style="vertical-align: middle;" src="static/blank.gif" alt="required ratio = (maximum required ratio) * (1 - (seeding / snatched))"
-              onload="if (this.src.substr(this.src.length - 9, this.src.length) == 'blank.gif') { this.src = 'https://chart.googleapis.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl=%5Ctextrm%7B%28maximum+required+ratio%29+%2A+%281-%5Cfrac%7Bseeding%7D%7Bsnatched%7D%29%7D&amp;chco=' + hexify(getComputedStyle(this.parentNode, null).color); }" />
+        <img style="vertical-align: middle;" src="<?=ImageTools::process('https://chart.googleapis.com/chart?cht=tx&chf=bg,s,FFFFFF00&chl=%5Ctextrm%7B%28maximum+required+ratio%29+%2A+%281-%5Cfrac%7Bseeding%7D%7Bsnatched%7D%29%7D&ext=.png')?>" alt="required ratio = (maximum required ratio) * (1 - (seeding / snatched))" />
         </div>
         <br />
         <br />
@@ -144,28 +143,26 @@ $GB = 1024*1024*1024;
       <li>If you stop seeding for one week, your required ratio will become the maximum required ratio (0% seeded) for your amount downloaded bracket. Once you have resumed seeding for a 72 hour
         period, your required ratio will decrease according to the above calculations.
       </li>
-      <li>If your download total is less than 5 GB, you won&apos;t be eligible for ratio watch, and you will not need a required ratio. In this circumstance, your required ratio will be zero
+      <li>If your download total is less than 10 GiB, you won't be eligible for ratio watch, and you will not need a required ratio. In this circumstance, your required ratio will be zero
         regardless of your seeding percentage.
       </li>
-      <li>If your download total is less than 20 GB and you are seeding a number of torrents equal to 100% of your snatches, your required ratio will be zero.</li>
-      <li>As your download total increases, your minimum (100% seeded) and maximum (0% seeded) required ratios taper together. After you have downloaded 100 GB, those values become equal to each
-        other. This means that users with download totals greater than or equal to 100 GB have a minimum required ratio (100% seeded) of 0.60 from that point forward.
+      <li>If your download total is less than 60 GiB and you are seeding a number of torrents equal to 100% of your snatches, your required ratio will be zero.</li>
+      <li>As your download total increases, your minimum (100% seeded) and maximum (0% seeded) required ratios taper together. After you have downloaded 200 GiB, those values become equal to each other. This means that users with download totals greater than or equal to 200 GiB have a minimum required ratio (100% seeded) of 0.60 from that point forward.
       </li>
     </ul>
-    <br />
-    <br />
+    <br>
+    <br>
     <strong>Required Ratio Example:</strong>
-    <br />
+    <br>
     <ul>
-      <li>In this example, Rippy has downloaded 25 GB. Rippy falls into the 20&ndash;30 GB amount downloaded bracket in the table above. Rippy&apos;s maximum required ratio (0% seeded) is 0.30, and his minimum required ratio (100% seeded) is 0.05.
+      <li>In this example, Alice has downloaded 65 GB. Alice falls into the 60&ndash;80 GiB amount downloaded bracket in the table above. Alice's maximum required ratio (0% seeded) is 0.40, and her minimum required ratio (100% seeded) is 0.10.
       </li>
-      <li>In this example, Rippy has snatched 90 torrents, and is currently seeding 45 torrents.</li>
-      <li>To calculate Rippy&apos;s actual required ratio, we take his maximum required ratio (0% seeded), which is 0.30, and multiply it by [1 &minus; (<var>seeding</var> / <var>snatched</var>)] (which is 0.50). Written out:
-        <samp>0.30 * [1 &minus; (45 / 90)] = 0.15</samp>
+      <li>In this example, Alice has snatched 90 torrents, and is currently seeding 45 torrents.</li>
+      <li>To calculate Alice's actual required ratio, we take her maximum required ratio (0% seeded), which is 0.40, and multiply it by [1 &minus; (<var>seeding</var> / <var>snatched</var>)] (which is 0.50). Written out:
+        <samp>0.40 * [1 &minus; (45 / 90)] = 0.20</samp>
       </li>
-      <li>The resulting required ratio is 0.15, which falls between the maximum required ratio of 0.30 and the minimum required ratio of 0.05 for his amount downloaded bracket.</li>
-      <li>If Rippy&apos;s on-site required ratio was listed as a value greater than the calculated value, this would be because he hadn&apos;t seeded those 45 torrents for a 72 hour period in the
-        last week. In this case, the system would not be counting all 45 torrents as seeded.
+      <li>The resulting required ratio is 0.20, which falls between the maximum required ratio of 0.40 and the minimum required ratio of 0.10 for her amount downloaded bracket.</li>
+      <li>If Alice's on-site required ratio was listed as a value greater than the calculated value, this would be because she hadn't seeded those 45 torrents for a 72 hour period in the last week. In this case, the system would not be counting all 45 torrents as seeded.
       </li>
     </ul>
     <br />
@@ -173,13 +170,11 @@ $GB = 1024*1024*1024;
     <strong>Ratio Watch Overview:</strong>
     <br />
     <ul>
-      <li>Everyone gets to download their first 5 GB before ratio watch eligibility begins.</li>
-      <li>If you&apos;ve downloaded more than 5 GB and your ratio does not meet or surpass your required ratio, you will be put on ratio watch and have <strong>two weeks</strong> to raise your
-        ratio above your required ratio.
+      <li>Everyone gets to download their first 10 GiB before ratio watch eligibility begins.</li>
+      <li>If you've downloaded more than 10 GiB and your ratio does not meet or surpass your required ratio, you will be put on ratio watch and have <strong>two weeks</strong> to raise your ratio above your required ratio.
       </li>
-      <li>If you download 10 GB while on ratio watch, your leeching privileges will automatically be disabled.</li>
-      <li>If you fail to leave ratio watch within a two week period, you will lose leeching privileges. After losing leeching privileges, you will be unable to download more data. Your account
-        will remain enabled.
+      <li>If you download 1i0 GB while on ratio watch, your leeching privileges will automatically be disabled.</li>
+      <li>If you fail to leave ratio watch within a two week period, you will lose leeching privileges. After losing leeching privileges, you will be unable to download more data. Your account will remain enabled.
       </li>
       <li>The ratio watch system is automated and cannot be interrupted by staff.</li>
     </ul>
@@ -193,8 +188,7 @@ $GB = 1024*1024*1024;
       </li>
       <li>If you fail to improve your ratio by the time ratio watch expires and lose leeching privileges, your required ratio will be temporarily set to the maximum possible requirement (as if 0% of snatched torrents were being seeded).
       </li>
-      <li>After losing leeching privileges, in order to adjust the required ratio so that it reflects the actual number of torrents being seeded, you must seed for a combined 72 hours within a weeklong period. After 72
-        hours of seeding occur, the required ratio will update to reflect your current seeding total, just as it would for a leech-enabled user.
+      <li>After losing leeching privileges, in order to adjust the required ratio so that it reflects the actual number of torrents being seeded, you must seed for a combined 72 hours within a weeklong period. After 72 hours of seeding occur, the required ratio will update to reflect your current seeding total, just as it would for a leech-enabled user.
       </li>
       <li>Leeching privileges will be restored once your ratio has become greater than or equal to your required ratio.</li>
     </ul>

sections/rules/requests.php

@@ -8,6 +8,9 @@ View::show_header('Request Rules');
   </div>
   <div class="box pad rule_summary" style="padding: 10px 10px 10px 20px;">
     <ul>
+      <li>
+        <strong>Uploads fulfilling a request must actually meet the request requirements.</strong> It doesn't matter if you think your upload is better than what was requested, or even if the requested content doesn't exist and the request is unfillable. You may not fill a request with any upload that does not meet all of the given request criteria. If you feel that the requester made a mistake, contact them and get them to change the request before you try to fill it.
+      </li>
       <li>
         <strong>Do not make requests for torrents that break the rules.</strong> It is your responsibility that the request follows the rules. Your request will be deleted, and you will not get your bounty back. Requests cannot be more specific than the upload (and trumping) rules.
       </li>
@@ -15,19 +18,19 @@ View::show_header('Request Rules');
         <strong>Put format specifics in the request description.</strong> If you're requesting a particular container, resolution, translation group, etc., put that information in the request description. Do not put it in the title of the request.
       </li>
       <li>
-        <strong>Only one title (movie, game, etc.) per request.</strong> No requests for multiple titles or vague requirements. You may ask for multiple formats, but you cannot specify all of them. For example, you may ask for either a MKV or OGM,  but not both formats. Game requests can consist of only one game, but may span a range of different versions. However, such requests can be filled with only one version of that title.
+        <strong>Only one title (movie, game, etc.) per request.</strong> No requests for multiple titles or vague requirements. You may ask for any of several formats, but you cannot demand all of them. For example, you may ask for either an MKV or OGM, but not both formats. Game requests can consist of only one game, but may span a range of different versions. Such a request will be filled with any one version of that title.
       </li>
       <li>
-        <strong>When uploading to fill a request, use the [Upload request] link on the request's page.</strong> This will autofill some of the metadata for the torrent, such as title and artist. This prevents some errors that may cause your upload to break the rules, have your request unfill, have your bounty removed, and possibly receive a warning.
+        <strong>When uploading to fill a request, use the [Upload request] link on the request's page.</strong> This will autofill some of the metadata for the torrent, such as title and artist. This prevents some errors that may cause your upload to break the rules, have your request unfilled, have your bounty removed, and possibly cause you to receive a warning.
       </li>
       <li>
-        <strong>Do not unfill requests for trivial reasons.</strong> If you did not specify in your request what you wanted (such as encoding or a particular edition), you fucked up. Do not unfill and later change the description. Do not unfill requests if you are unsure of what you are doing. Ask for help from <a href="/staff.php">first-line support or staff</a> in that case. You may unfill the request if the torrent does not fit your specifications stated clearly in the request.
+        <strong>Do not unfill requests for trivial reasons.</strong> If you did not specify in your request what you wanted (such as encoding or a particular edition), it's your fault. Do not unfill and later change the description. Do not unfill requests if you are unsure of what you are doing. Ask for help from <a href="/staff.php">first-line support or staff</a> in that case. You may only unfill the request if the torrent does not fit your specifications stated clearly in the request.
       </li>
       <li>
-        <strong>All users must have an equal chance to fill a request.</strong> Exchanging favors for other users is probably fine, but abusing the request system is not tolerated. That includes making specific requests for certain users (whether explicitly named or not). Making requests and then unfilling so that one particular user can fill the request is not allowed. Don't be a dick. If reported, both the requester and user filling the request will receive a warning and lose the request bounty.
+        <strong>All users must have an equal chance to fill a request.</strong> Exchanging favors for other users is probably fine, but abusing the request system is not tolerated. That includes making specific requests for certain users (whether explicitly named or not). Making requests and then unfilling so that one particular user can fill the request is not allowed. If reported, both the requester and user filling the request will receive a warning and lose the request bounty.
       </li>
       <li>
-        <strong>No manipulation of the requester for bounty.</strong> The bounty is a reward for helping other users&#8202;&mdash;&#8202;it should not be a ransom. Any user who openly refuses to fill a request unless the bounty is increased will face harsh punishment if they're being a shithead about it.
+        <strong>No manipulation of the requester for bounty.</strong> The bounty is a reward for helping other users &mdash; it should not be a ransom. Any user who openly refuses to fill a request unless the bounty is increased will face harsh punishment if they're being a shithead about it.
       </li>
     </ul>
   </div>