Skip to content

Commit 19e5f4d

Browse files
committed
Update content from ejabberd by running "make clean extract"
1 parent 5082cf9 commit 19e5f4d

File tree

6 files changed

+44
-32
lines changed

6 files changed

+44
-32
lines changed

content/README-GIT.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<img src="https://img.shields.io/github/v/tag/processone/docs.ejabberd.im?sort=semver&logo=&label=docs&logoWidth=0" /></a>
2727
</p>
2828

29-
3029
[ejabberd][im] is an open-source,
3130
robust, scalable and extensible realtime platform built using [Erlang/OTP][erlang],
3231
that includes [XMPP][xmpp] Server, [MQTT][mqtt] Broker and [SIP][sip] Service.
@@ -41,12 +40,16 @@ Installation
4140
There are several ways to install ejabberd:
4241

4342
- Source code: compile yourself, see [COMPILE](admin/install/source.md)
44-
- Installers: [ProcessOne Download][p1download] and [GitHub Releases][releases] for releases, [GitHub Actions](https://github.com/processone/ejabberd/actions/workflows/installers.yml) for master branch (run/deb/rpm for x64 and arm64)
45-
- `ecs` container image: [Docker Hub][hubecs] and [Github Packages][packagesecs], see [ecs README][docker-ecs-readme] (for x64)
46-
- `ejabberd` container image: [Github Packages][packages] for releases and master branch, see [CONTAINER](CONTAINER.md) (for x64 and arm64)
43+
- Installers:
44+
- [ProcessOne Download Page][p1download] or [GitHub Releases][releases] for releases.
45+
- [GitHub Actions](https://github.com/processone/ejabberd/actions/workflows/installers.yml) for master branch (`run`/`deb`/`rpm` for `x64` and `arm64`)
46+
- Docker Containers:
47+
- `ecs` container image: [Docker Hub][hubecs] and [Github Packages][packagesecs], see [ecs README][docker-ecs-readme] (for `x64`)
48+
- `ejabberd` container image: [Github Packages][packages] for releases and master branch, see [CONTAINER](CONTAINER.md) (for `x64` and `arm64`)
4749
- Using your [Operating System package][osp]
4850
- Using the [Homebrew][homebrew] package manager
4951

52+
More info can be found in the `Installation` part of [ejabberd Docs](https://docs.ejabberd.im/admin/install/).
5053

5154
Documentation
5255
-------------
@@ -63,7 +66,6 @@ Once ejabberd is installed, try:
6366
ejabberdctl help
6467
man ejabberd.yml
6568

66-
6769
Development
6870
-----------
6971

@@ -76,6 +78,7 @@ or in your local machine as explained in [Localization][localization].
7678
Documentation for developers is available in [ejabberd docs: Developers][docs-dev].
7779

7880
There are nightly builds of ejabberd, both for `master` branch and for Pull Requests:
81+
7982
- Installers: go to [GitHub Actions: Installers](https://github.com/processone/ejabberd/actions/workflows/installers.yml), open the most recent commit, on the bottom of that commit page, download the `ejabberd-packages.zip` artifact.
8083
- `ejabberd` container image: go to [ejabberd Github Packages][packages]
8184

@@ -86,7 +89,6 @@ or some other method from [ProcessOne Contact][p1contact].
8689
For commercial offering and support, including [ejabberd Business Edition][p1home]
8790
and [Fluux (ejabberd in the Cloud)][fluux], please check [ProcessOne ejabberd page][p1home].
8891

89-
9092
Community
9193
---------
9294

@@ -96,13 +98,11 @@ There are several places to get in touch with other ejabberd developers and admi
9698
- [GitHub Discussions][discussions]
9799
- [Stack Overflow][stackoverflow]
98100

99-
100101
License
101102
-------
102103

103-
ejabberd is released under the GNU General Public License v2 (see [COPYING](COPYING.md)),
104-
and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MIT License.
105-
104+
- `ejabberd` is released under the __GNU General Public License v2__ (see [COPYING](COPYING.md))
105+
- [ejabberd translations](https://github.com/processone/ejabberd-po/) under __MIT License__.
106106

107107
[discussions]: https://github.com/processone/ejabberd/discussions
108108
[docker-ecs-readme]: https://github.com/processone/docker-ejabberd/tree/master/ecs#readme
@@ -119,16 +119,15 @@ and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MI
119119
[mqtt]: https://mqtt.org/
120120
[muc]: xmpp:[email protected]
121121
[osp]: https://docs.ejabberd.im/admin/install/os-package/
122-
[p1contact]: https://www.process-one.net/en/company/contact/
123-
[p1download]: https://www.process-one.net/en/ejabberd/downloads/
124-
[p1home]: https://www.process-one.net/en/ejabberd/
122+
[p1contact]: https://www.process-one.net/contact/
123+
[p1download]: https://www.process-one.net/download/ejabberd/
124+
[p1home]: https://www.process-one.net/ejabberd/
125125
[packages]: https://github.com/processone/ejabberd/pkgs/container/ejabberd
126126
[packagesecs]: https://github.com/processone/docker-ejabberd/pkgs/container/ecs
127127
[releases]: https://github.com/processone/ejabberd/releases
128128
[sip]: https://en.wikipedia.org/wiki/Session_Initiation_Protocol
129129
[stackoverflow]: https://stackoverflow.com/questions/tagged/ejabberd?sort=newest
130130
[weblate]: https://hosted.weblate.org/projects/ejabberd/ejabberd-po/
131-
[xeps]: https://www.process-one.net/en/ejabberd/protocols/
131+
[xeps]: https://www.process-one.net/ejabberd-features/
132132
[xmpp]: https://xmpp.org/
133133
[xmppej]: https://xmpp.org/software/servers/ejabberd/
134-

content/admin/configuration/modules.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ search:
55

66
# Modules Options
77

8-
> This section describes modules options of ejabberd [24.10](../../archive/24.10/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md). The modules
9-
that changed in this version are marked with 🟤.
8+
!!! info "Please note"
9+
10+
This section describes modules options of ejabberd [24.10](../../archive/24.10/index.md).35. If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
11+
12+
The modules that changed in this version are marked with 🟤.
1013

1114
mod\_adhoc
1215
----------
@@ -1192,7 +1195,8 @@ mod\_matrix\_gw
11921195
<!-- md:version added in [24.02](../../archive/24.02/index.md) -->
11931196

11941197

1195-
[Matrix](https://matrix.org/) gateway.
1198+
[Matrix](https://matrix.org/) gateway. Erlang/OTP 25 or higher is
1199+
required to use this module.
11961200

11971201
__Available options:__
11981202

content/admin/configuration/toplevel.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ search:
55

66
# Top-Level Options
77

8-
> This section describes top level options of ejabberd [24.10](../../archive/24.10/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md). The options
9-
that changed in this version are marked with 🟤.
8+
!!! info "Please note"
9+
10+
This section describes top level options of ejabberd [24.10](../../archive/24.10/index.md).35. If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
11+
12+
The options that changed in this version are marked with 🟤.
1013

1114
## access\_rules
1215

content/contributing/index.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ support platforms, the best being [Stack Overflow][stackoverflow].
2525

2626
Stack Overflow is a much better place to ask questions since:
2727

28-
- there are thousands of people willing to help on Stack Overflow
29-
- questions and answers stay available for public viewing so your question / answer might help
28+
* there are thousands of people willing to help on Stack Overflow
29+
* questions and answers stay available for public viewing so your question / answer might help
3030
someone else
31-
- Stack Overflow's voting system assures that the best answers are prominently visible.
31+
* Stack Overflow's voting system assures that the best answers are prominently visible.
3232

3333
To save your and our time, we will systematically close all issues that are requests for general
3434
support and redirect people to the section you are reading right now.
3535

3636
Other channels for support are:
37-
- ejabberd XMPP room: [[email protected]][muc]
38-
- [ejabberd XMPP room logs][logs]
39-
- [ejabberd Mailing List][list]
37+
38+
* ejabberd XMPP room: [[email protected]][muc]
39+
* [ejabberd Mailing List][list]
4040

4141
### Found an Issue or Bug?
4242

@@ -80,6 +80,7 @@ Before you submit your pull request consider the following guidelines:
8080
```shell
8181
git checkout -b my-fix-branch master
8282
```
83+
8384
* Test your changes and, if relevant, expand the automated test suite.
8485
* Create your patch commit, including appropriate test cases.
8586
* If the changes affect public APIs, change or add relevant [documentation][doc-repo].
@@ -88,6 +89,7 @@ Before you submit your pull request consider the following guidelines:
8889
```shell
8990
git commit -a
9091
```
92+
9193
Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
9294

9395
* Push your branch to GitHub:
@@ -128,22 +130,20 @@ That's it! Thank you for your contribution!
128130
Upon submitting a Pull Request, we will ask you to sign our CLA if you haven't done
129131
so before. It's a quick process, we promise, and you will be able to do it all online
130132
131-
You can read [ProcessOne Contribution License Agreement][cla] in PDF.
133+
Here's a link to the [ProcessOne Contribution License Agreement][cla].
132134

133135
This is part of the legal framework of the open-source ecosystem that adds some red tape,
134136
but protects both the contributor and the company / foundation behind the project. It also
135137
gives us the option to relicense the code with a more permissive license in the future.
136138

137-
138139
[coc]: https://github.com/processone/ejabberd/blob/master/CODE_OF_CONDUCT.md
139140
[stackoverflow]: https://stackoverflow.com/questions/tagged/ejabberd?sort=newest
140141
[list]: https://lists.jabber.ru/mailman/listinfo/ejabberd
141142
[muc]: xmpp:[email protected]
142-
[logs]: https://process-one.net/logs/[email protected]/
143143
[github]: https://github.com/processone/ejabberd
144144
[github-issues]: https://github.com/processone/ejabberd/issues
145145
[github-new-issue]: https://github.com/processone/ejabberd/issues/new
146146
[github-pr]: https://github.com/processone/ejabberd/pulls
147147
[doc-repo]: https://github.com/processone/docs.ejabberd.im
148148
[developer-setup]: https://docs.ejabberd.im/developer/
149-
[cla]: https://www.process-one.net/resources/ejabberd-cla.pdf
149+
[cla]: https://cla.process-one.net/

content/developer/ejabberd-api/admin-api.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ search:
55

66
# API Reference
77

8-
> This section describes API commands of ejabberd [24.10](../../archive/24.10/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md). The commands that changed in this version are marked with 🟤.
8+
!!! info "Please note"
9+
10+
This section describes API commands of ejabberd [24.10](../../archive/24.10/index.md).35. If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
11+
12+
The commands that changed in this version are marked with 🟤
913

1014

1115

content/developer/ejabberd-api/admin-tags.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# API Tags
22

3-
> This section enumerates the API tags of ejabberd [24.10](../../archive/24.10/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
3+
!!! info "Please note"
4+
5+
This section enumerates the API tags of ejabberd [24.10](../../archive/24.10/index.md).35. If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
46

57

68

0 commit comments

Comments
 (0)