From deb1508d2fe5082a685e7bf617de13c88bc1e2cd Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Tue, 7 Jan 2020 13:54:46 +0900
Subject: [PATCH] Cleanup documentation and metadata (#15)

---
 .editorconfig       | 3 +++
 .github/FUNDING.yml | 2 --
 CHANGELOG.md        | 4 ++--
 Cargo.toml          | 8 ++++----
 LICENSE-APACHE      | 2 +-
 LICENSE-MIT         | 2 +-
 README.md           | 8 ++------
 7 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.editorconfig b/.editorconfig
index f6da06d69..74c73a970 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,6 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+[*.yml]
+indent_size = 2
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index e4510bce2..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-github: svartalf
-custom: https://svartalf.info/donate/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e233fae3..6ea50a810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [0.3.2] - 2019-07-19
 ### Changed
- - Middleware accepts any `Fn` as a validator function instead of `FnMut` ([#11](https://github.com/svartalf/actix-web-httpauth/pull/11))
+ - Middleware accepts any `Fn` as a validator function instead of `FnMut` ([#11](https://github.com/actix/actix-web-httpauth/pull/11))
 
 ## [0.3.1] - 2019-06-09
 ### Fixed
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [0.2.0] - 2019-04-26
 ### Changed
- - `actix-web` dependency is used without default features now ([#6](https://github.com/svartalf/actix-web-httpauth/pull/6))
+ - `actix-web` dependency is used without default features now ([#6](https://github.com/actix/actix-web-httpauth/pull/6))
  - `base64` dependency version was bumped to `0.10`
 
 ## [0.1.0] - 2018-09-08
diff --git a/Cargo.toml b/Cargo.toml
index de6c12ae7..10858ca48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "actix-web-httpauth"
 version = "0.3.2"
-authors = ["svartalf <self@svartalf.info>"]
+authors = ["svartalf <self@svartalf.info>", "Yuki Okushi <huyuumi.dev@gmail.com>"]
 description = "HTTP authentication schemes for actix-web"
 readme = "README.md"
 keywords = ["http", "web", "framework"]
-homepage = "https://github.com/svartalf/actix-web-httpauth"
-repository = "https://github.com/svartalf/actix-web-httpauth.git"
+homepage = "https://github.com/actix/actix-web-httpauth"
+repository = "https://github.com/actix/actix-web-httpauth.git"
 documentation = "https://docs.rs/actix-web-httpauth/"
 categories = ["web-programming::http-server"]
 license = "MIT OR Apache-2.0"
@@ -28,5 +28,5 @@ default = []
 nightly = []
 
 [badges]
-travis-ci = { repository = "svartalf/actix-web-httpauth", branch = "master" }
+travis-ci = { repository = "actix/actix-web-httpauth", branch = "master" }
 maintenance = { status = "passively-maintained" }
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
index b3844ab27..7692e1a23 100644
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017-NOW svartalf
+   Copyright 2017-NOW svartalf and Actix team
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
index a82012880..44a057e4a 100644
--- a/LICENSE-MIT
+++ b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2017 svartalf
+Copyright (c) 2017 svartalf and Actix team
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
diff --git a/README.md b/README.md
index 5e5b76d30..a2e9d66b9 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 [![Latest Version](https://img.shields.io/crates/v/actix-web-httpauth.svg)](https://crates.io/crates/actix-web-httpauth)
 [![Latest Version](https://docs.rs/actix-web-httpauth/badge.svg)](https://docs.rs/actix-web-httpauth)
-[![dependency status](https://deps.rs/crate/actix-web-httpauth/0.3.1/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.3.1)
-![Build Status](https://travis-ci.org/svartalf/actix-web-httpauth.svg?branch=master)
+[![dependency status](https://deps.rs/crate/actix-web-httpauth/0.3.2/status.svg)](https://deps.rs/crate/actix-web-httpauth/0.3.2)
+![Build Status](https://travis-ci.org/actix/actix-web-httpauth.svg?branch=master)
 ![Apache 2.0 OR MIT licensed](https://img.shields.io/badge/license-Apache2.0%2FMIT-blue.svg)
 
 HTTP authentication schemes for [actix-web](https://github.com/actix/actix-web) framework.
@@ -20,7 +20,3 @@ and can be used both in the middlewares and request handlers.
 
  * [Basic](https://tools.ietf.org/html/rfc7617)
  * [Bearer](https://tools.ietf.org/html/rfc6750)
-
-## Donations
-
-If you appreciate my work and want to support me, you can do it [here](https://svartalf.info/donate/).