diff options
| author | Juuso Lapinlampi <wub@partyvan.eu> | 2016-05-27 06:28:37 +0200 |
|---|---|---|
| committer | Juuso Lapinlampi <wub@partyvan.eu> | 2016-05-27 06:28:37 +0200 |
| commit | dcdb6f1dd68335b1d264ddaa7cd72c8b9c18a3ca (patch) | |
| tree | 3392691c9bca56822b2660de038df6c11347b322 | |
| parent | f1c529fe1129c81dd9600ba303d867ba2f805df8 (diff) | |
| parent | 19965ab389d48e879b011e03be8b58916a495ba3 (diff) | |
Merge branch 'wub/use-rfc-2142-info'
- FAQ: Change non-abuse contact to info@pantsu.cat
- CHANGELOG: Update 2.1.0 up to 49e2fa5
The FAQ incorrectly uses contact@ as the point of contact for non-abuse
communication. This mailbox name is not recognized by RFC 2142, but
info@ is.
Reviewed-by: Eliot Whalan <ewhal@pantsu.cat>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | pages/faq.swig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a26bee..705aee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Luminarys added to `package.json` contributors. (Juuso Lapinlampi) - Missing essential PHP includes and classes are now errors (`require_once`) instead of warnings (`include_once`). (Austin Gillmann) +- Non-abuse contact email to <info@pantsu.cat>. (Juuso Lapinlampi) ### Deprecated diff --git a/pages/faq.swig b/pages/faq.swig index ef3b6fc..eb78e46 100644 --- a/pages/faq.swig +++ b/pages/faq.swig @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <p>Please contact the appropriate law enforcement agency if you notice illegal works hosted on Pantsu.cat. We have not been trained or qualified to investigate and fight crimes and enforce the law, so it's not appropriate to send accusations of illegal activity to us. <strong>You must contact the appropriate law enforcement office.</strong> They may then contact us if appropriate.</p> <p>If you are an Australian law enforcement official and you need our assistance, please contact <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a>. If you are a law enforcement official from another country, we may voluntarily cooperate if the crime you are investigating would also be illegal in Australia.</p> <h2>I have a question...</h2> - <p>Send us an email at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> and let's talk!</p> + <p>Send us an email at <a href="mailto:info@pantsu.cat">info@pantsu.cat</a> and let's talk!</p> </article> {% include "nav.swig" %} {% endblock %} |