Rewording, typos and what not (PokeAPI#266)

Marcus Crane · phalt · commit 8ce2bedf0632 · 2016-09-12T11:28:42.000+01:00
* Fixed a few typos, did a wee bit of reworking and fixed/edited some links

* Changed stripe image to use https in order to avoid mixed content requests

* Small rewordings and typo fixed

* Fixed my own typo ;)
diff --git a/templates/base_docs.html b/templates/base_docs.html
@@ -94,8 +94,8 @@ <h2 id="fairuse">Fair Use Policy</h2>
                         </ul>
 
                     <h2 id="slack">Slack</h2>
-                    <p>Have questions? Ideas? Notice something amiss here in the docs? Hit us up on Slack. Sign up <a href="https://pokeapi-slack-invite.herokuapp.com/">right here.</a> then visit our <a href="https://pokeapi.slack.com">slack team</a>.
-                    We'ed encourage you to come here before opening a ticket on github so we can keep our issues nice and organized. Theres also a solid group of people using the api
+                    <p>Have questions? Ideas? Notice something amiss here in the docs? Hit us up on Slack. Sign up <a href="https://pokeapi-slack-invite.herokuapp.com/">right here</a> then visit our <a href="https://pokeapi.slack.com">slack team</a>.
+                    We encourage you to come here before opening a ticket on github, so we can keep our issues nice and organized. There are also a solid group of people using the API
                     who may already have answers or plans from experience.</p>
 
                     {% block docsbody %}
diff --git a/templates/pages/about.html b/templates/pages/about.html
@@ -59,7 +59,7 @@ <h1>The RESTful Pokémon Data API</h1>
                 <div class="well">
                     <p>
                         This website provides a RESTful API interface to highly detailed objects built from thousands of lines of data
-                        related to <a href="https://en.wikipedia.org/wiki/Pokemon">Pokémon</a>. We specifically cover the video game franchise, though we'd like to cover the card game too. Using this website you can consume information on Pokémon, their moves, abilities, types, egg groups and much much more.
+                        related to <a href="https://en.wikipedia.org/wiki/Pokemon">Pokémon</a>. We specifically cover the video game franchise, though we'd like to cover the card game too. Using this website, you can consume information on Pokémon, their moves, abilities, types, egg groups and much much more.
                     </p>
                 </div>
                 <p class="lead">
@@ -70,11 +70,11 @@ <h1>The RESTful Pokémon Data API</h1>
                         This is probably worth clearing up very quickly for those who don't know.<br />
                         An API (Application Programming Interface) is a set of interfaces (in this case, url links)
                         that are publicly available, that allow developers to interact with an application.<br />
-                        In this instance; the application is a database of thousands oc pokemon-related objects.
+                        In this instance; the application is a database of thousands of pokemon-related objects.
                     </p>
                 </div>
                 <p class="lead">
-                    Isn't there 101 other Pokémon websites already?
+                    Aren't there 101 other Pokémon websites already?
                 </p>
                 <div class="well">
                     <p>
@@ -88,7 +88,7 @@ <h1>The RESTful Pokémon Data API</h1>
                         can consume and use.
                     </p>
                     <p>
-                        Often, and especially when new Pokémon games or updates are released, the 101+ websites
+                        Often, and especially when new Pokémon games or updates are released, those 101+ websites
                         take <b>weeks</b> to update as people have to enter the same information in all those different places.
                         </p>
                         <p>This solves that problem.
@@ -130,7 +130,7 @@ <h1>The RESTful Pokémon Data API</h1>
                 <div class="well">
                     <p>
                         We know! Feel free to contribute to open issues on <a href="https://github.com/PokeAPI/pokeapi/">GitHub</a>. <br/>
-                        Have ideas for new features? We're on Slack! Sign up <a href="https://pokeapi-slack-invite.herokuapp.com/">right here.</a> then visit our <a href="https://pokeapi.slack.com">slack team</a>.
+                        Have ideas for new features? We're on Slack! Sign up <a href="https://pokeapi-slack-invite.herokuapp.com/">right here</a> then visit our <a href="https://pokeapi.slack.com">slack team</a>.
                     </p>
                 </div>
                 <p class="lead">
@@ -144,11 +144,11 @@ <h1>The RESTful Pokémon Data API</h1>
                         With direction from Paul, Zane created the V2 api using an exact mirror of <a href="http://github.com/eevee">Veekun's</a> data related to the main series of games.
                     </p>
                     <p>
-                        We have a <a href="https://github.com/pokeapi">GitHub Organisation</a> of contributors. You're welcome to join!
+                        We have a <a href="https://github.com/pokeapi">GitHub organisation</a> of contributors that you are welcome to join!
                     </p>
                 </div>
                 <p class="lead">
-                    Whered you get all of this data?
+                    Where did you get all of this data?
                 </p>
                 <div class="well">
                     <p>
@@ -170,9 +170,9 @@ <h1>The RESTful Pokémon Data API</h1>
                 </p>
                 <div class="well">
                     <p>
-                        The website framework is <a href="http://djangoproject.com" target="none">Django</a>,
-                        a super awesome framework built around <a hre="http://python.org" target="none">Python</a>.<br />
-                        We use a <a href="http://www.postgresql.org" target="none">Postgres</a> database to store all our data.<br />
+                        The website framework is <a href="https://djangoproject.com" target="none">Django</a>,
+                        a super awesome framework built around <a href="https://python.org" target="none">Python</a>.<br />
+                        We use a <a href="https://www.postgresql.org" target="none">Postgres</a> database to store all our data.<br />
                         We use <a href="http://www.django-rest-framework.org/" target="none">Django REST Framework</a> to expose our data through a RESTful API.<br />
                         We're hosted on <a href="https://www.digitalocean.com/?refcode=eab2fea41bc6" target="none">DigitalOcean</a> servers, who cover the cost of the servers, for free! We <3 them.
                     </p>
diff --git a/templates/pages/docsv2.md b/templates/pages/docsv2.md
@@ -180,7 +180,7 @@ Berries are small fruits that can provide HP and status condition restoration, s
 | firmness           | The firmness of this berry, used in making Pokéblocks or Poffins                                                                  | [NamedAPIResource](#namedapiresource) ([BerryFirmness](#berry-firmnesses)) |
 | flavors            | A list of references to each flavor a berry can have and the potency of each of those flavors in regard to this berry             | list [BerryFlavorMap](#berryflavormap)                                     |
 | item               | Berries are actually items. This is a reference to the item specific data for this berry.                                         | [NamedAPIResource](#namedapiresource) ([Item](#items))                     |
-| natural_gift_type  | The Type the move "Natural Gift" has when used with this Berry                                                                    | [NamedAPIResource](#namedapiresource) ([Type](#types))                     |
+| natural_gift_type  | The type inherited by "Natural Gift" when used with this Berry                                                                    | [NamedAPIResource](#namedapiresource) ([Type](#types))                     |
 
 #### BerryFlavorMap
 
@@ -2822,7 +2822,7 @@ A Pokémon Species forms the basis for at least one Pokémon. Attributes of a Po
 | generation             | The generation this Pokémon species was introduced in                                                                                              | [NamedAPIResource](#namedapiresource) ([Generation](#generations))          |
 | names                  | The name of this Pokémon species listed in different languages                                                                                     | list [Name](#resourcename)                                                  |
 | pal_park_encounters    | A list of encounters that can be had with this Pokémon species in pal park                                                                         | list [PalParkEncounterArea](#palparkencounterarea)                          |
-| flavor_text_entries    | A list of flavor text entries for this Pokémon species                                                                                             | list [FlavorText](#flavortext)                                              | 
+| flavor_text_entries    | A list of flavor text entries for this Pokémon species                                                                                             | list [FlavorText](#flavortext)                                              |
 | form_descriptions      | Descriptions of different forms Pokémon take on within the Pokémon species                                                                         | list [Description](#description)                                            |
 | genera                 | The genus of this Pokémon species listed in multiple languages                                                                                     | list [Genus](#genus)                                                        |
 | varieties              | A list of the Pokémon that exist within this Pokémon species                                                                                       | list [PokemonSpeciesVariety](#pokemonspeciesvariety)                        |
diff --git a/templates/pages/home.html b/templates/pages/home.html
@@ -238,7 +238,7 @@ <h1>
                               <script
                                 src="https://checkout.stripe.com/checkout.js" class="stripe-button"
                                 data-key="{{stripe_key}}"
-                                data-image="http://i.imgur.com/Jya9cm0.png"
+                                data-image="https://i.imgur.com/Jya9cm0.png"
                                 data-name="pokeapi.co"
                                 data-description="Donate and keep pokeapi alive!"
                                 data-amount="1000"
