Merge branch 'danielmiessler:master' into master

Discovery/Web-Content/common.txt

@@ -76,6 +76,7 @@
 .well-known/nodeinfo
 .well-known/oauth-authorization-server
 .well-known/openid-configuration
+.well-known/openid-federation
 .well-known/openorg
 .well-known/openpgpkey
 .well-known/pki-validation
@@ -319,6 +320,7 @@ ServerAdministrator
 Services
 Servlet
 Servlets
+Shibboleth.sso/Metadata
 SiteMap
 SiteScope
 SiteServer
@@ -1758,6 +1760,7 @@ fdcp
 feature
 featured
 features
+federation/clients
 fedora
 feed
 feedback
@@ -2351,6 +2354,7 @@ jump
 juniper
 junk
 jvm
+jwks.json
 k
 katalog
 kb
@@ -2848,6 +2852,9 @@ nz
 o
 oa_servlets
 oauth
+oauth/authorize
+oauth/token
+oauth/token/info
 obdc
 obj
 object
@@ -2979,6 +2986,7 @@ panelc
 paper
 papers
 parse
+par
 part
 partenaires
 partner
@@ -4151,6 +4159,9 @@ today
 todel
 todo
 toggle
+token
+token/introspect
+token/revoke
 tomcat
 tomcat-docs
 tool