Merge pull request #578 from djhoese/doc-fix-conduct

Fix code of conduct contacts list

CONTRIBUTING.rst

@@ -121,8 +121,8 @@ PyTroll Contributor Weeks (PCW), conference meet-ups, or any other time when
 the project is being represented.
 
 Any violations of this code of conduct will be handled by the core maintainers
-of the project including David Hoese, Martin Raspaud, Adam Dybbroe, and Panu
-Lahtinen. If you wish to report one of the maintainers for a violation and are
+of the project including David Hoese, Martin Raspaud, and Adam Dybbroe.
+If you wish to report one of the maintainers for a violation and are
 not comfortable with them seeing it, please contact one or more of the other
 maintainers to report the violation. Responses to violations will be
 determined by the maintainers and may include one or more of the following:

README.rst

@@ -44,7 +44,7 @@ Code of Conduct
 ---------------
 
 SatPy follows the same code of conduct as the PyTroll project. For reference
-it is copied to this repository in [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
+it is copied to this repository in CODE_OF_CONDUCT.md_.
 
 As stated in the PyTroll home page, this code of conduct applies to the
 project space (GitHub) as well as the public space online and offline when
@@ -55,8 +55,8 @@ PyTroll Contributor Weeks (PCW), conference meet-ups, or any other time when
 the project is being represented.
 
 Any violations of this code of conduct will be handled by the core maintainers
-of the project including David Hoese, Martin Raspaud, Adam Dybbroe, and Panu
-Lahtinen. If you wish to report one of the maintainers for a violation and are
+of the project including David Hoese, Martin Raspaud, and Adam Dybbroe.
+If you wish to report one of the maintainers for a violation and are
 not comfortable with them seeing it, please contact one or more of the other
 maintainers to report the violation. Responses to violations will be
 determined by the maintainers and may include one or more of the following:
@@ -66,4 +66,6 @@ determined by the maintainers and may include one or more of the following:
 - Temporary or permanent ban from in-person events
 - Temporary or permanent ban from online communication (Slack, mailing list, etc)
 
-For details see the official [code of conduct document](CODE_OF_CONDUCT.md).
+For details see the official CODE_OF_CONDUCT.md_.
+
+.. _CODE_OF_CONDUCT.md: ./CODE_OF_CONDUCT.md