Merge branch 'g7_2.2.4_candidate' into g8_2.3.1_candidate

Author: Kuchenmampfer

docs/client/logging_in.rst

@@ -4,9 +4,9 @@ Logging In
 ==========
 A coc.py client instance can be created directly by :class:`Client`. The instance can then be logged in with the methods
 
-.. autofunction:: coc.client.Client.login
+.. autofunction:: coc.Client.login
 
-.. autofunction:: coc.client.Client.login_with_tokens
+.. autofunction:: coc.Client.login_with_tokens
 
 
 Example

docs/miscellaneous/changelog.rst

@@ -52,7 +52,7 @@ Bugs Fixed:
 
 - Fixed a bug that tried to use a cache when `max_cache_size` was set to 0
 
-- Corrected order of elixir troups
+- Corrected order of elixir troops
 
 - Fixed a bug when clans faced each other multiple times in one raid weekend