Merge branch 'v10.4-documentation' of https://github.com/mattermost/docs

 into v10.4-documentation

source/collaborate/manage-channel-bookmarks.rst

@@ -4,7 +4,7 @@ Manage channel bookmarks
 .. include:: ../_static/badges/ent-pro-cloud-selfhosted.rst
   :start-after: :nosearch:
 
-You can bookmark up to 50 links or files to the top of channels for quick and easy access, unless your system admin has disabled your ability to do so. Bookmarked links and files display in the bookmarks bar located directly below the channel header.
+From Mattermost v10.1, you can bookmark up to 50 links or files to the top of channels for quick and easy access, unless your system admin has disabled your ability to do so. Bookmarked links and files display in the bookmarks bar located directly below the channel header.
 
 .. tip::
 

source/install/setup-nginx-proxy.rst

@@ -93,7 +93,7 @@ NGINX is configured using a file in the ``/etc/nginx/sites-available`` directory
 
 3. Open the file ``/etc/nginx/sites-available/mattermost`` (Ubuntu) or  ``/etc/nginx/conf.d/mattermost`` (RHEL 8) as *root* user in a text editor and replace its contents, if any, with the following lines. Make sure that you use your own values for the Mattermost server IP address and FQDN for *server_name*.
 
-SSL and HTTP/2 with server push are enabled in the provided configuration example.
+SSL and HTTP/2 are enabled in the provided configuration example.
 
   .. note::
 
@@ -120,8 +120,6 @@ SSL and HTTP/2 with server push are enabled in the provided configuration exampl
        listen [::]:443 ssl http2;
        server_name    mattermost.example.com;
 
-       http2_push_preload on; # Enable HTTP/2 Server Push
-
        ssl_certificate /etc/letsencrypt/live/{domain-name}/fullchain.pem;
        ssl_certificate_key /etc/letsencrypt/live/{domain-name}/privkey.pem;
        ssl_session_timeout 1d;