From 473ee1f5bd21acfb87aab78caf42923710392850 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Mon, 27 Jul 2026 17:09:38 +0200 Subject: [PATCH 1/2] Update xwiki docs to link to the xwiki.org documentation The Usage link pointed at the source repository's README.md, but the XWiki Docker documentation now lives on xwiki.org, so link to it directly. Also refresh a few stale links while in there: - The LICENSE links used the old xwiki-contrib/docker-xwiki repository name, which now only works through a GitHub rename redirect. - The "where to get help" pages were renamed upstream: Community/MailingLists is now Community/Discuss and Community/IRC is now Community/Chat. The mailing lists are no longer used, so only the forum is linked now. - http:// -> https:// on the xwiki.org and jira.xwiki.org links. Co-Authored-By: Claude Opus 5 (1M context) --- xwiki/content.md | 6 +++--- xwiki/get-help.md | 2 +- xwiki/issues.md | 2 +- xwiki/license.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xwiki/content.md b/xwiki/content.md index afcc0f8e843c..d6db8a34ee51 100644 --- a/xwiki/content.md +++ b/xwiki/content.md @@ -1,13 +1,13 @@ # What is XWiki -[XWiki](http://xwiki.org) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management. +[XWiki](https://xwiki.org) is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management. As an application wiki, XWiki allows for the storing of structured data and the execution of server side script within the wiki interface. Scripting languages including Velocity, Groovy, Python, Ruby and PHP can be written directly into wiki pages using wiki macros. User-created data structures can be defined in wiki documents and instances of those structures can be attached to wiki documents, stored in a database, and queried using either Hibernate query language or XWiki's own query language. -[XWiki.org's extension wiki](http://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](http://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it. +[XWiki.org's extension wiki](https://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](https://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it. %%LOGO%% # Usage -Please check the [documentation](https://github.com/xwiki-contrib/docker-xwiki/blob/master/README.md) to learn how to use the XWiki Docker images. +Please check the [documentation](https://www.xwiki.org/xwiki/bin/view/documentation/xs/admin/installation/methods/install-xwiki-docker/) to learn how to use the XWiki Docker images. diff --git a/xwiki/get-help.md b/xwiki/get-help.md index c8769ff9fe46..81ef80a2e1ce 100644 --- a/xwiki/get-help.md +++ b/xwiki/get-help.md @@ -1 +1 @@ -[the XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or [the XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC) +[the XWiki Forum](https://dev.xwiki.org/xwiki/bin/view/Community/Discuss) or [the XWiki Chat](https://dev.xwiki.org/xwiki/bin/view/Community/Chat) diff --git a/xwiki/issues.md b/xwiki/issues.md index 2f935e86eff1..c73a063d495a 100644 --- a/xwiki/issues.md +++ b/xwiki/issues.md @@ -1 +1 @@ -[the XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER) +[the XWiki Docker JIRA project](https://jira.xwiki.org/browse/XDOCKER) diff --git a/xwiki/license.md b/xwiki/license.md index 1b4f268135fe..1ee30293cd41 100644 --- a/xwiki/license.md +++ b/xwiki/license.md @@ -1,3 +1,3 @@ -XWiki is licensed under the [LGPL 2.1](https://github.com/xwiki-contrib/docker-xwiki/blob/master/LICENSE). +XWiki is licensed under the [LGPL 2.1](https://github.com/xwiki/xwiki-docker/blob/master/LICENSE). -The Dockerfile repository is also licensed under the [LGPL 2.1](https://github.com/xwiki-contrib/docker-xwiki/blob/master/LICENSE). +The Dockerfile repository is also licensed under the [LGPL 2.1](https://github.com/xwiki/xwiki-docker/blob/master/LICENSE). From ba2e8e775166d8e694bf1111fbd426b4be09ef79 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Mon, 27 Jul 2026 17:14:08 +0200 Subject: [PATCH 2/2] Fix typo in XWiki extensions description --- xwiki/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki/content.md b/xwiki/content.md index d6db8a34ee51..13ebf4fb04a0 100644 --- a/xwiki/content.md +++ b/xwiki/content.md @@ -4,7 +4,7 @@ As an application wiki, XWiki allows for the storing of structured data and the execution of server side script within the wiki interface. Scripting languages including Velocity, Groovy, Python, Ruby and PHP can be written directly into wiki pages using wiki macros. User-created data structures can be defined in wiki documents and instances of those structures can be attached to wiki documents, stored in a database, and queried using either Hibernate query language or XWiki's own query language. -[XWiki.org's extension wiki](https://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](https://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki Enterprise's features are provided by extensions which are bundled with it. +[XWiki.org's extension wiki](https://extensions.xwiki.org) is home to XWiki extensions ranging from [code snippets](https://snippets.xwiki.org) which can be pasted into wiki pages to loadable core modules. Many of XWiki's features are provided by extensions which are bundled with it. %%LOGO%%