From 1a789c9723290bae007b9dccf5cf5c609b13d8b8 Mon Sep 17 00:00:00 2001 From: Joseph Cayouette Date: Mon, 3 Mar 2025 14:35:24 +0100 Subject: [PATCH] update --- Makefile.en | 2 +- Makefile.j2 | 2 +- Makefile.ja | 2 +- Makefile.ko | 2 +- Makefile.zh_CN | 2 +- .../client-configuration/pages/registration-cli.adoc | 12 +++++++++--- modules/legal/pages/copyright.adoc | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile.en b/Makefile.en index d1a8f9b65ba..379e1d7e36a 100644 --- a/Makefile.en +++ b/Makefile.en @@ -48,7 +48,7 @@ prepare-antora-mlm-en: copy-branding-en set-html-language-selector-mlm-en cd $(current_dir) .PHONY: antora-mlm-en -antora-mlm-en: configure-mlm-branding-dsc-en prepare-antora-mlm-en pdf-all-mlm-en pdf-tar-mlm-en +antora-mlm-en: configure-mlm-branding-dsc-en prepare-antora-mlm-en #pdf-all-mlm-en #pdf-tar-mlm-en $(call antora-mlm-function,translations/en,en) diff --git a/Makefile.j2 b/Makefile.j2 index 90471205dfd..45a5c48c914 100644 --- a/Makefile.j2 +++ b/Makefile.j2 @@ -48,7 +48,7 @@ prepare-antora-mlm-{{ langcode }}: copy-branding-{{ langcode }} set-html-languag cd $(current_dir) .PHONY: antora-mlm-{{ langcode }} -antora-mlm-{{ langcode }}: configure-mlm-branding-dsc-{{langcode}} prepare-antora-mlm-{{ langcode }} pdf-all-mlm-{{ langcode }} pdf-tar-mlm-{{ langcode }} +antora-mlm-{{ langcode }}: configure-mlm-branding-dsc-{{langcode}} prepare-antora-mlm-{{ langcode }} #pdf-all-mlm-{{ langcode }} #pdf-tar-mlm-{{ langcode }} $(call antora-mlm-function,translations/{{ langcode }},{{ langcode }}) diff --git a/Makefile.ja b/Makefile.ja index 1998d7f9201..e0a49a326eb 100644 --- a/Makefile.ja +++ b/Makefile.ja @@ -48,7 +48,7 @@ prepare-antora-mlm-ja: copy-branding-ja set-html-language-selector-mlm-ja cd $(current_dir) .PHONY: antora-mlm-ja -antora-mlm-ja: configure-mlm-branding-dsc-ja prepare-antora-mlm-ja pdf-all-mlm-ja pdf-tar-mlm-ja +antora-mlm-ja: configure-mlm-branding-dsc-ja prepare-antora-mlm-ja #pdf-all-mlm-ja #pdf-tar-mlm-ja $(call antora-mlm-function,translations/ja,ja) diff --git a/Makefile.ko b/Makefile.ko index 7a0d285e2ce..f2a7a41b1ca 100644 --- a/Makefile.ko +++ b/Makefile.ko @@ -48,7 +48,7 @@ prepare-antora-mlm-ko: copy-branding-ko set-html-language-selector-mlm-ko cd $(current_dir) .PHONY: antora-mlm-ko -antora-mlm-ko: configure-mlm-branding-dsc-ko prepare-antora-mlm-ko pdf-all-mlm-ko pdf-tar-mlm-ko +antora-mlm-ko: configure-mlm-branding-dsc-ko prepare-antora-mlm-ko #pdf-all-mlm-ko #pdf-tar-mlm-ko $(call antora-mlm-function,translations/ko,ko) diff --git a/Makefile.zh_CN b/Makefile.zh_CN index bd90feca22e..fc293c63cc5 100644 --- a/Makefile.zh_CN +++ b/Makefile.zh_CN @@ -48,7 +48,7 @@ prepare-antora-mlm-zh_CN: copy-branding-zh_CN set-html-language-selector-mlm-zh_ cd $(current_dir) .PHONY: antora-mlm-zh_CN -antora-mlm-zh_CN: configure-mlm-branding-dsc-zh_CN prepare-antora-mlm-zh_CN pdf-all-mlm-zh_CN pdf-tar-mlm-zh_CN +antora-mlm-zh_CN: configure-mlm-branding-dsc-zh_CN prepare-antora-mlm-zh_CN #pdf-all-mlm-zh_CN #pdf-tar-mlm-zh_CN $(call antora-mlm-function,translations/zh_CN,zh_CN) diff --git a/modules/client-configuration/pages/registration-cli.adoc b/modules/client-configuration/pages/registration-cli.adoc index 8163af57c51..b5f20b93bae 100644 --- a/modules/client-configuration/pages/registration-cli.adoc +++ b/modules/client-configuration/pages/registration-cli.adoc @@ -43,6 +43,7 @@ For more information about the Salt bundle, see xref:client-configuration:contac + +.Configuration File [source, Shell] ---- /etc/venv-salt-minion/minion @@ -54,6 +55,7 @@ or: + +.Configuration File [source, Shell] ---- /etc/venv-salt-minion/minion.d/NAME.conf @@ -62,18 +64,22 @@ or: + +.Configuration Parameters [source, YAML] ---- master: SERVER.EXAMPLE.COM grains: susemanager: - activation_key: "" + activation_key: "" <1> server_id_use_crc: adler32 -enable_legacy_startup_events: False -enable_fqdns_grains: False +enable_legacy_startup_events: False <2> +enable_fqdns_grains: False <3> ---- +<1> Activation key Name +<2> Legacy events should be set to False +<3> fqdns Grains should be set to False . Restart the [systemitem]``venv-salt-minion`` service: diff --git a/modules/legal/pages/copyright.adoc b/modules/legal/pages/copyright.adoc index 69e20c8ffea..43061fc1148 100644 --- a/modules/legal/pages/copyright.adoc +++ b/modules/legal/pages/copyright.adoc @@ -2,5 +2,5 @@ Copyright (c) 2011 - {currentyear} SUSE LLC. {productname} LICENSE AGREEMENT -This software is a modular operating system comprised of numerous components that may be accompanied by separate license terms. The software is a collective work of SUSE; although SUSE does not own the copyright to every component of the software, SUSE owns the collective work copyright for the software. +The software is a collective work of SUSE; although SUSE does not own the copyright to every component of the software, SUSE owns the collective work copyright for the software. This SUSE product includes materials licensed to SUSE under the GNU General Public License (GPL). The GPL requires that SUSE makes available certain source code that corresponds to the GPL-licensed material. The source code is available for download at https://www.suse.com/download-linux/source-code.html. Also, for up to three years from SUSE's distribution of the SUSE product, upon request SUSE will mail a copy of the source code. Requests should be sent by e-mail to sle_source_request@suse.com or as otherwise instructed at https://www.suse.com/download-linux/source-code.html. SUSE may charge a fee to recover its reasonable costs of distribution