From 345af5a5352bd6a0a5b36f3851317182f2a99759 Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 29 Mar 2024 16:09:50 +0100 Subject: [PATCH] Remove ... in example configuration: it is assumed and reduces verbosity --- src/mod_delegation.erl | 1 - src/mod_http_fileserver.erl | 8 +------- src/mod_http_upload.erl | 8 +------- src/mod_http_upload_quota.erl | 6 +----- src/mod_mqtt_bridge.erl | 4 +--- src/mod_ping.erl | 4 +--- src/mod_pres_counter.erl | 4 +--- src/mod_privilege.erl | 4 +--- src/mod_proxy65.erl | 4 +--- src/mod_pubsub.erl | 8 ++------ src/mod_roster.erl | 4 +--- src/mod_s2s_dialback.erl | 4 +--- src/mod_service_log.erl | 4 +--- src/mod_sip.erl | 4 +--- 14 files changed, 14 insertions(+), 53 deletions(-) diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl index f45fea09f..d761b81b4 100644 --- a/src/mod_delegation.erl +++ b/src/mod_delegation.erl @@ -129,7 +129,6 @@ mod_doc() -> " server: sat-pubsub.example.org", "", "modules:", - " ...", " mod_delegation:", " namespaces:", " urn:xmpp:mam:1:", diff --git a/src/mod_http_fileserver.erl b/src/mod_http_fileserver.erl index f48bed8fe..19d59c958 100644 --- a/src/mod_http_fileserver.erl +++ b/src/mod_http_fileserver.erl @@ -561,18 +561,13 @@ mod_doc() -> "content type 'ogg' is defined, 'png' is redefined, and 'jpg' " "definition is deleted:"), ["listen:", - " ...", " -", " port: 5280", " module: ejabberd_http", " request_handlers:", - " ...", " /pub/content: mod_http_fileserver", - " ...", - " ...", "", "modules:", - " ...", " mod_http_fileserver:", " docroot: /var/www", " accesslog: /var/log/ejabberd/access.log", @@ -585,5 +580,4 @@ mod_doc() -> " content_types:", " .ogg: audio/ogg", " .png: image/png", - " default_content_type: text/html", - " ..."]}]}. + " default_content_type: text/html"]}]}. diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl index 7cf404946..f40fc8945 100644 --- a/src/mod_http_upload.erl +++ b/src/mod_http_upload.erl @@ -384,23 +384,17 @@ mod_doc() -> " street: Elm Street"]}]}}], example => ["listen:", - " ...", " -", " port: 5443", " module: ejabberd_http", " tls: true", " request_handlers:", - " ...", " /upload: mod_http_upload", - " ...", - " ...", "", "modules:", - " ...", " mod_http_upload:", " docroot: /ejabberd/upload", - " put_url: \"https://@HOST@:5443/upload\"", - " ..."]}. + " put_url: \"https://@HOST@:5443/upload\""]}. -spec depends(binary(), gen_mod:opts()) -> [{module(), hard | soft}]. depends(_Host, _Opts) -> diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl index 3782079f8..3935588f7 100644 --- a/src/mod_http_upload_quota.erl +++ b/src/mod_http_upload_quota.erl @@ -134,19 +134,15 @@ mod_doc() -> "to use the quota feature. You can stick to the default names " "and just specify access rules such as those in this example:"), ["shaper_rules:", - " ...", " soft_upload_quota:", " 1000: all # MiB", " hard_upload_quota:", " 1100: all # MiB", - " ...", "", "modules:", - " ...", " mod_http_upload: {}", " mod_http_upload_quota:", - " max_days: 100", - " ..."]}]}. + " max_days: 100"]}]}. -spec depends(binary(), gen_mod:opts()) -> [{module(), hard | soft}]. depends(_Host, _Opts) -> diff --git a/src/mod_mqtt_bridge.erl b/src/mod_mqtt_bridge.erl index 95d5052e6..8ba69288d 100644 --- a/src/mod_mqtt_bridge.erl +++ b/src/mod_mqtt_bridge.erl @@ -178,7 +178,6 @@ mod_doc() -> ?T("It is available since ejabberd 23.01.")], example => ["modules:", - " ...", " mod_mqtt_bridge:", " servers:", " \"mqtt://server.com\":", @@ -189,8 +188,7 @@ mod_doc() -> " \"remoteB\": \"localB\" # changes to 'remoteB' on remote server will be stored as 'localB' on local server", " authentication:", " certfile: \"/etc/ejabberd/mqtt_server.pem\"", - " replication_user: \"mqtt@xmpp.server.com\"", - " ..."], + " replication_user: \"mqtt@xmpp.server.com\""], opts => [{servers, #{value => "{ServerUrl: {publish: [TopicPairs], subscribe: [TopicPairs], authentication: [AuthInfo]}}", diff --git a/src/mod_ping.erl b/src/mod_ping.erl index 4f7aab9ba..2947f1454 100644 --- a/src/mod_ping.erl +++ b/src/mod_ping.erl @@ -352,9 +352,7 @@ mod_doc() -> "The default value is 'none'.")}}], example => ["modules:", - " ...", " mod_ping:", " send_pings: true", " ping_interval: 4 min", - " timeout_action: kill", - " ..."]}. + " timeout_action: kill"]}. diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl index efafe2a0f..58029eadc 100644 --- a/src/mod_pres_counter.erl +++ b/src/mod_pres_counter.erl @@ -150,8 +150,6 @@ mod_doc() -> ?T("The time interval. The default value is '1' minute.")}}], example => ["modules:", - " ...", " mod_pres_counter:", " count: 5", - " interval: 30 secs", - " ..."]}. + " interval: 30 secs"]}. diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl index ad9362368..7524af181 100644 --- a/src/mod_privilege.erl +++ b/src/mod_privilege.erl @@ -163,15 +163,13 @@ mod_doc() -> "The default value is 'none'.")}}]}], example => ["modules:", - " ...", " mod_privilege:", " roster:", " get: all", " presence:", " managed_entity: all", " message:", - " outgoing: all", - " ..."]}. + " outgoing: all"]}. depends(_, _) -> []. diff --git a/src/mod_proxy65.erl b/src/mod_proxy65.erl index 8f0ce6f8d..e606260ea 100644 --- a/src/mod_proxy65.erl +++ b/src/mod_proxy65.erl @@ -274,7 +274,6 @@ mod_doc() -> " proxyrate: 10240", "", "modules:", - " ...", " mod_proxy65:", " host: proxy1.example.org", " name: \"File Transfer Proxy\"", @@ -284,5 +283,4 @@ mod_doc() -> " access: proxy65_access", " shaper: proxy65_shaper", " recbuf: 10240", - " sndbuf: 10240", - " ..."]}. + " sndbuf: 10240"]}. diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 4cd2bd59e..1c6de26df 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -4524,7 +4524,6 @@ mod_doc() -> [{?T("Example of configuration that uses flat nodes as default, " "and allows use of flat, hometree and pep nodes:"), ["modules:", - " ...", " mod_pubsub:", " access_createnode: pubsub_createnode", " max_subscriptions_node: 100", @@ -4534,14 +4533,12 @@ mod_doc() -> " max_items: 4", " plugins:", " - flat", - " - pep", - " ..."]}, + " - pep"]}, {?T("Using relational database requires using mod_pubsub with " "db_type 'sql'. Only flat, hometree and pep plugins supports " "SQL. The following example shows previous configuration " "with SQL usage:"), ["modules:", - " ...", " mod_pubsub:", " db_type: sql", " access_createnode: pubsub_createnode", @@ -4549,6 +4546,5 @@ mod_doc() -> " last_item_cache: false", " plugins:", " - flat", - " - pep", - " ..."]} + " - pep"]} ]}. diff --git a/src/mod_roster.erl b/src/mod_roster.erl index b205db2ee..18d69a7ee 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -1410,8 +1410,6 @@ mod_doc() -> ?T("Same as top-level _`cache_life_time`_ option, but applied to this module only.")}}], example => ["modules:", - " ...", " mod_roster:", " versioning: true", - " store_current_id: false", - " ..."]}. + " store_current_id: false"]}. diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl index 54a7aa10a..620ab1b8c 100644 --- a/src/mod_s2s_dialback.erl +++ b/src/mod_s2s_dialback.erl @@ -93,14 +93,12 @@ mod_doc() -> "is 'all'.")}}], example => ["modules:", - " ...", " mod_s2s_dialback:", " access:", " allow:", " server: legacy.domain.tld", " server: invalid-cert.example.org", - " deny: all", - " ..."]}. + " deny: all"]}. s2s_in_features(Acc, _) -> [#db_feature{errors = true}|Acc]. diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl index 0239942c4..434798fd9 100644 --- a/src/mod_service_log.erl +++ b/src/mod_service_log.erl @@ -92,9 +92,7 @@ mod_doc() -> "to which stanzas will be forwarded.")}}], example => ["modules:", - " ...", " mod_service_log:", " loggers:", " - xmpp-server.tld", - " - component.domain.tld", - " ..."]}. + " - component.domain.tld"]}. diff --git a/src/mod_sip.erl b/src/mod_sip.erl index e8b7cb2f8..cb77227bf 100644 --- a/src/mod_sip.erl +++ b/src/mod_sip.erl @@ -437,7 +437,6 @@ mod_doc() -> "cannot omit \"port\" or \"scheme\").")}}], example => ["modules:", - " ...", " mod_sip:", " always_record_route: false", " record_route: \"sip:example.com;lr\"", @@ -449,7 +448,6 @@ mod_doc() -> " via:", " - tls://sip-tls.example.com:5061", " - tcp://sip-tcp.example.com:5060", - " - udp://sip-udp.example.com:5060", - " ..."]}. + " - udp://sip-udp.example.com:5060"]}. -endif.