Merge branch 'release' into dev

IdentityServer · Sep 6, 2018 · c291016 · c291016
2 parents 58f3ab9 + 6821c51
commit c291016
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,8 @@ Auth0 is an easy to implement authentication and identity management SaaS based
 
 [Thinktecture AG](https://www.thinktecture.com)  
 [Ritter Insurance Marketing](https://www.ritterim.com)  
+[Alcidion Corporation](https://www.alcidion.com)  
+[Intuit](https://www.intuit.com)  
 
 You can see a list of our current sponsors [here](https://github.com/IdentityServer/IdentityServer4/blob/release/SPONSORS.md) - and for companies we have some nice advertisement options as well.
 

diff --git a/SPONSORS.md b/SPONSORS.md
@@ -11,11 +11,13 @@ We thank those who [support](https://www.patreon.com/identityserver) IdentitySer
 ### Gold
 
 [Thinktecture AG](https://www.thinktecture.com)   ([@Thinktecture](https://twitter.com/thinktecture))  
-[Ritter Insurance Marketing](https://www.ritterim.com) ([@RitterIM](https://twitter.com/ritterim))
+[Ritter Insurance Marketing](https://www.ritterim.com) ([@RitterIM](https://twitter.com/ritterim))   
+[Alcidion Corporation](https://www.alcidion.com) ([@Alcidion](https://twitter.com/alcidion))  
+[Intuit](https://www.intuit.com) ([@IntuitDev](https://twitter.com/IntuitDev))  
+
 
 ### Silver
 
-Green Elephant IT Consulting ([@Schwamster](https://twitter.com/Schwamster))  
 Jacobus Roos  
 Tomer Dvir  
 Steinar	Noem  
@@ -59,3 +61,5 @@ Mauricio Schneider
 Norman L Covington  
 Henning Støverud  ([@henningst](https://twitter.com/henningst))  
 Ryan Mendoza  ([@elryry](https://twitter.com/elryry))  
+Colin Blair  
+Erik Gulbrandsen  
diff --git a/docs/quickstarts/6_aspnet_identity.rst b/docs/quickstarts/6_aspnet_identity.rst
@@ -124,7 +124,7 @@ The ``AddAspNetIdentity`` extension method requires a generic parameter which is
 
 **Configure**
 
-This shows both the template code generated for ASP.NET Identity, plus the call to ``UseIdentityServer`` which replaces the call to ``UseIdentity``.
+This shows both the template code generated for ASP.NET Identity, plus the call to ``UseIdentityServer`` which replaces the call to ``UseAuthentication``.
 
 ::