Merge branch '10.11' into 10.11-MDEV-38473

Author: mariadb-RexJohnston

CONTRIBUTING.md

@@ -5,15 +5,15 @@ MariaDB Server has a vibrant community contributing in a wide range of areas. Th
 ### Engage online with other community members
 ---
 -   [MariaDB on Zulip](https://mariadb.zulipchat.com/)
--   [maria-developers mailing list](http://launchpad.net/~maria-developers)
--   [maria-discuss mailing list](http://launchpad.net/~maria-discuss)
--   [maria-docs mailing list](http://launchpad.net/~maria-docs)
--   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/kb/en/mariadb/social-media/).
+-   [maria-developers mailing list](https://lists.mariadb.org/postorius/lists/developers.lists.mariadb.org/)
+-   [maria-discuss mailing list](https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/)
+-   [maria-docs mailing list](https://lists.mariadb.org/postorius/lists/docs.lists.mariadb.org/)
+-   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/docs/general-resources/community/joining-the-community).
 
 ### Help document MariaDB
 ----
--   Contribute towards [documenting MariaDB Server](https://mariadb.com/kb/en/meta/writing-editing-library-articles/)  and its ecosystem by adding new content or improving existing content.
--   [Translate](https://mariadb.com/kb/en/meta/translating-library-articles/)  existing documentation.
+-   Contribute towards [documenting MariaDB Server](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  and its ecosystem by adding new content or improving existing content.
+-   [Translate](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  existing documentation.
 
 ### Help debug and develop MariaDB
 -----
@@ -43,4 +43,4 @@ New contributors can ask questions any time, but we will provide immediate feedb
 ### Additional resources
 ----
  - [MariaDB Foundation ](https://mariadb.org/)
- - [Knowledge Base](https://mariadb.com/kb/en/)
+ - [MariaDB Documentation](https://mariadb.com/docs/)

CREDITS

@@ -66,7 +66,7 @@ following services to the MariaDB community:
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
 - Maintaining https://mariadb.org
-- Documenting MariaDB in the MariaDB Knowledge Base https://mariadb.com/kb
+- Documenting MariaDB in the MariaDB Documentation https://mariadb.com/kb
 
 To be able to do the above we need help from corporations and individuals!
 

Docs/mysql.info

@@ -241,4 +241,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisamchk(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/

man/aria_chk.1

@@ -50,6 +50,6 @@ Only read default options from the given file #.
 Read this file after the global files are read.
 .PP
 .SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/
 .SH AUTHOR
 MariaDB Foundation (http://www.mariadb.org/).

man/aria_dump_log.1

@@ -25,4 +25,4 @@ Be verbose.
 .SH "SEE ALSO"
 \fBmyisam_ftdump(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/

man/aria_ftdump.1

@@ -72,4 +72,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisampack(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/

man/aria_pack.1

@@ -104,4 +104,4 @@ Read this file after the global files are read.
 .SH "SEE ALSO"
 \fBmyisamlog(1)\fR
 .PP
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/

man/aria_read_log.1

@@ -49,4 +49,4 @@ Output debug log from marias3 to stdout
 \fB\-v\fR, \fB\-\-verbose\fR
 Be verbose.
 .PP
-For more information, please refer to the MariaDB Knowledge Base page https://mariadb.com/kb/en/aria_s3_copy/
+For more information, please refer to the MariaDB Documentation page https://mariadb.com/docs/server/server-usage/storage-engines/s3-storage-engine/aria_s3_copy

man/aria_s3_copy.1

@@ -256,6 +256,6 @@ This documentation is distributed in the hope that it will be useful, but WITHOU
 You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/.
 .sp
 .SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs/
 .SH AUTHOR
 MariaDB Foundation (http://www.mariadb.org/).