Merge pull request #532 from tspiteri/more-quotes

More quotes

Author: ashleygwilliams

templates/learn/get-started.hbs

@@ -154,10 +154,10 @@ fn main() {
       <h2>Who’s this crab, Ferris?</h2>
       <div class="highlight"></div>
     </header>
-    <p>Ferris is the unofficial mascot of the Rust Community. Many Rust programmers call themselves "Rustaceans",
-      a play on the word "<a href="https://en.wikipedia.org/wiki/Crustacean">crustacean</a>". We refer to Ferris with
-      the pronouns "they", "them", etc., rather than with gendered pronouns.</p>
-    <p>Ferris is a name playing off of the adjective, "ferrous", meaning of or pertaining to iron. Since Rust often
+    <p>Ferris is the unofficial mascot of the Rust Community. Many Rust programmers call themselves “Rustaceans,”
+      a play on the word “<a href="https://en.wikipedia.org/wiki/Crustacean">crustacean</a>.” We refer to Ferris with
+      the pronouns “they,” “them,” etc., rather than with gendered pronouns.</p>
+    <p>Ferris is a name playing off of the adjective, “ferrous,” meaning of or pertaining to iron. Since Rust often
       forms on iron, it seemed like a fun origin for our mascot’s name!</p>
     <p>You can find more images of Ferris on <a href="http://rustacean.net/" target="_blank" rel="noopener">http://rustacean.net/</a>.
       <img alt="a gif of ferris scurrying side to side" src=/static/images/ferris.gif />

templates/policies/media-guide.hbs

@@ -12,7 +12,7 @@
       <h2>Art license</h2>
       <div class="highlight"></div>
     </header>
-    <p>The Rust and Cargo logos (bitmap and vector) are owned by Mozilla and distributed under the terms of the <a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons Attribution license (CC-BY)</a>. This is the most permissive Creative Commons license, and allows reuse and modifications for any purpose. The restrictions are that distributors must “give appropriate credit, provide a link to the license, and indicate if changes were made”. <strong>Note that use of these logos, and the Rust and Cargo names, is also governed by trademark; our trademark policy is described below</strong>.</p>
+    <p>The Rust and Cargo logos (bitmap and vector) are owned by Mozilla and distributed under the terms of the <a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons Attribution license (CC-BY)</a>. This is the most permissive Creative Commons license, and allows reuse and modifications for any purpose. The restrictions are that distributors must “give appropriate credit, provide a link to the license, and indicate if changes were made.” <strong>Note that use of these logos, and the Rust and Cargo names, is also governed by trademark; our trademark policy is described below</strong>.</p>
   </div>
 </section>
 
@@ -70,7 +70,7 @@
       <li>Stating accurately that software is written in the Rust programming language, that it is compatible with the Rust programming language, or that it contains the Rust programming language, is allowed. In those cases, you may use the Rust trademarks to indicate this, without prior approval. This is true both for non-commercial and commercial uses.</li>
       <li>Using the Rust trademarks in the names of non-commercial products like RustPostgres or Rustymine, or in the name of code repositories in e.g. GitHub, is allowed when referring to use with or suitability for the Rust programming language. Such uses may also include the Rust logo, even in modified form. For commercial products (including crowdfunded or sponsored ones), please check in at <a href="mailto:[email protected]">[email protected]</a> to ensure your use does not appear official.</li>
       <li>Using the Rust trademarks on t-shirts, hats, and other artwork or merchandise, even in modified form, is allowed for your personal use or for use by a small group of community members, as long as they are not sold. If you want to distribute merchandise with Rust Trademarks at a Rust affiliated event, please contact us for permission at <a href="mailto:[email protected]">[email protected]</a>.</li>
-      <li>Using the Rust trademarks (even in modified form) for social events like meetups, tutorials, and the like is allowed for events that are free to attend. For commercial events (including sponsored ones), please check in at <a href="mailto:[email protected]">[email protected]</a>. However, the words “RustCamp”, “RustCon” or “RustConf” cannot be used without explicit permission. And, as with all of the above uses, the <strong>event cannot appear to be officially endorsed or run by the Rust project</strong> without written permission.</li>
+      <li>Using the Rust trademarks (even in modified form) for social events like meetups, tutorials, and the like is allowed for events that are free to attend. For commercial events (including sponsored ones), please check in at <a href="mailto:[email protected]">[email protected]</a>. However, the words “RustCamp,” “RustCon” or “RustConf” cannot be used without explicit permission. And, as with all of the above uses, the <strong>event cannot appear to be officially endorsed or run by the Rust project</strong> without written permission.</li>
       <li>Using the Rust trademarks in books or publications like “Rust Journal” or “Rust Cookbook” is allowed.</li>
       <li>Using of the word “Rust” on websites, brochures, documentation, academic papers, books, and product packaging to refer to the Rust programming language or the Rust project is allowed.</li>
     </ul>