diff --git a/docs/auth.rst b/docs/auth.rst
index 81360d31e..ea80deae5 100644
--- a/docs/auth.rst
+++ b/docs/auth.rst
@@ -143,10 +143,8 @@ You can specify the literal value as we saw earlier, or reference a filename to
 
   jwt-secret = "@rsa.jwk.pub"
 
-.. _jwt_validation:
-
-JWT Validation
-~~~~~~~~~~~~~~
+JWT Claims Validation
+~~~~~~~~~~~~~~~~~~~~~
 
 PostgREST honors the :code:`exp` claim for token expiration, rejecting expired tokens.
 
@@ -168,19 +166,22 @@ PostgREST uses JWT mainly for authentication and authorization purposes and enco
 Custom Validation
 -----------------
 
-PostgREST does not enforce any extra constraints besides :ref:`jwt_validation`. An example of an extra constraint would be to immediately revoke access for a certain user. Using :ref:`db-pre-request` you can specify a stored procedure to call immediately after :ref:`user_impersonation` and before the main query itself runs.
+PostgREST does not enforce any extra constraints besides JWT validation. An example of an extra constraint would be to immediately revoke access for a certain user. Using :ref:`db-pre-request` you can specify a stored procedure to call immediately after :ref:`user_impersonation` and before the main query itself runs.
 
 .. code:: ini
 
   db-pre-request = "public.check_user"
 
-In the function you can run arbitrary code to check the request and raise an exception to block it if desired.
+In the function you can run arbitrary code to check the request and raise an exception(see :ref:`raise_error`) to block it if desired. You can take advantage of :ref:`guc_req_headers_cookies_claims` for
+doing custom logic based on the web user info.
 
 .. code-block:: postgres
 
   CREATE OR REPLACE FUNCTION check_user() RETURNS void AS $$
+  DECLARE
+    email text := current_setting('request.jwt.claims', true)::json->>'email';
   BEGIN
-    IF current_user = 'evil_user' THEN
+    IF email = 'evil.user@malicious.com' THEN
       RAISE EXCEPTION 'No, you are evil'
         USING HINT = 'Stop being so evil and maybe you can log in';
     END IF;
diff --git a/docs/index.rst b/docs/index.rst
index 81ae15fbf..5034f843a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -70,7 +70,7 @@ Sponsors
 Database as Single Source of Truth
 ----------------------------------
 
-Using PostgREST is an alternative to manual CRUD programming. Custom API servers suffer problems. Writing business logic often duplicates, ignores or hobbles database structure. Object-relational mapping is a leaky abstraction leading to slow imperative code. The PostgREST philosophy establishes a single declarative source of truth: the database itself.
+Using PostgREST is an alternative to manual CRUD programming. Custom API servers suffer problems. Writing business logic often duplicates, ignores or hobbles database structure. Object-relational mapping is a leaky abstraction leading to slow imperative code. The PostgREST philosophy establishes a single declarative source of truth: the data itself.
 
 Declarative Programming
 -----------------------