Skip to content

Commit

Permalink
Change "OS" to "operating system" per RHSSG
Browse files Browse the repository at this point in the history
  • Loading branch information
max-svistunov committed Nov 4, 2024
1 parent f246113 commit fd91a2a
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Red{nbsp}Hat repositories set architecture and operating system version restrict
endif::[]
endif::[]
ifndef::orcharhino[]
Red{nbsp}Hat repositories set architecture and OS version restrictions automatically.
Red{nbsp}Hat repositories set architecture and operating system version restrictions automatically.

Release version::
Certain Red{nbsp}Hat repositories, such as the {RHEL} dot release repositories, include a *Release version* in their repository metadata.
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_supported-ansible-versions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
= Supported Ansible versions

{Project} uses Ansible as provided by the base operating system of {ProjectServer} or any {SmartProxies} for remote execution.
Therefore, the supported version of Ansible depends on your base OS configuration.
Therefore, the supported version of Ansible depends on your base operating system configuration.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ endif::[]
. From the *Type* list, select `yum` as type of repository.
. Optional: From the *Restrict to Architecture* list, select an architecture.
If you want to make the repository available to all hosts regardless of the architecture, ensure to select *No restriction*.
. Optional: From the *Restrict to OS Version* list, select the OS version.
If you want to make the repository available to all hosts regardless of the OS version, ensure to select *No restriction*.
. Optional: From the *Restrict to OS Version* list, select the operating system version.
If you want to make the repository available to all hosts regardless of the operating system version, ensure to select *No restriction*.
. Optional: In the *Upstream URL* field, enter the URL of the external repository to use as a source.
{Project} supports three protocols: `http://`, `https://`, and `file://`.
If you are using a `file://` repository, you have to place it under `/var/lib/pulp/sync_imports/` directory.
Expand Down Expand Up @@ -67,7 +67,7 @@ By default, the repository is published through HTTP.
--gpg-key-id _My_GPG_Key_ID_ \
--name "_My_Repository_" \
--organization "_My_Organization_" \
--os-version "_My_OS_Version_" \
--os-version "_My_Operating_System_Version_" \
--product "_My_Product_" \
--publish-via-http true \
--url _My_Upstream_URL_
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.Procedure

// List of supported OS for foreman-deb has to match "guides/common/modules/proc_upgrading-a-connected-project-server.adoc"
// List of supported operating systems for foreman-deb has to match "guides/common/modules/proc_upgrading-a-connected-project-server.adoc"
[tabs]
=====
Debian 11 (Bullseye)::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To create a host group for each lifecycle environment, run the following Bash sc

[source,terminal,options="nowrap" subs="+quotes"]
----
MAJOR="_My_Major_OS_Version_"
MAJOR="_My_Major_Operating_System_Version_"
ARCH="_My_Architecture_"
ORG="_My_Organization_"
LOCATIONS="_My_Location_"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For more information, see xref:creating-provisioning-templates_{context}[].
. Click the *Association* tab.
. From the *Application Operating Systems* list, select an operating system.
. Click *Submit* to save the provisioning template.
. Create a host that is associated with the provisioning template or rebuild a host using the OS associated with the modified template.
. Create a host that is associated with the provisioning template or rebuild a host using the operating system associated with the modified template.
For more information, see {ManagingHostsDocURL}Creating_a_Host_managing-hosts[Creating a Host] in _{ManagingHostsDocTitle}_.
+
The SSH keys of the *Owned by* user are added automatically when the `create_users` snippet is executed during the provisioning process.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[id="Determining_Hardware_and_OS_Configuration_{context}"]
= Determining hardware and OS configuration
[id="Determining_Hardware_and_operating_system_Configuration_{context}"]
= Determining hardware and operating system configuration

CPU::
The more physical cores that are available to {Project}, the higher throughput can be achieved for the tasks.
Expand Down
4 changes: 2 additions & 2 deletions guides/common/modules/proc_importing-templates.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Before you import a template, ensure that you add the following section to the t
kind: provision
name: _My_Provisioning_Template_
oses:
- _My_first_OS_
- _My_second_OS_
- _My_first_Operating_System_
- _My_second_Operating_System_
locations:
- _My_first_Location_
- _My_second_Location_
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[id="Restricting_a_{customrepoid}_to_a_Specific_OS_Version_or_Architecture_in_Project_{context}"]
[id="Restricting_a_{customrepoid}_to_a_Specific_operating_system_Version_or_Architecture_in_Project_{context}"]
= Restricting a {customrepo} to a specific operating system or architecture in {Project}

You can configure {Project} to make a {customrepo} available only on hosts with a specific operating system version or architecture.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Before you import a template, ensure that you add the following section to the t
kind: provision
name: _My_Provisioning_Template_
oses:
- _My_first_OS_
- _My_second_OS_
- _My_first_Operating_System_
- _My_second_Operating_System_
locations:
- _My_first_Location_
- _My_second_Location_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ deb http://deb.theforeman.org/ _My_Distribution_Code_Name_ {ProjectVersion}
deb http://deb.theforeman.org/ plugins {ProjectVersion}
----
+
// List of supported OS for foreman-deb has to match "guides/common/modules/proc_configuring-repositories-foreman-deb.adoc"
// List of supported operating systems for foreman-deb has to match "guides/common/modules/proc_configuring-repositories-foreman-deb.adoc"
Replace _My_Distribution_Code_Name_ with the proper distribution code name based on the operating system of your {ProjectServer}:
+
* `bullseye` for Debian 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ baseurl=http://_server.example.com_/sat6/Maintenance/
endif::[]
endif::[]
ifndef::satellite[]
. Install additional OS specific packages (`leapp-data-almalinux` for AlmaLinux, `leapp-data-centos` for CentOS Stream, or `leapp-data-rocky` for Rocky Linux).
. Install additional packages specific to the operating system (`leapp-data-almalinux` for AlmaLinux, `leapp-data-centos` for CentOS Stream, or `leapp-data-rocky` for Rocky Linux).
See `ID` in `/etc/os-release` for your operating system code.
+
[options="nowrap", subs="+quotes,verbatim,attributes"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ For physical or virtual BIOS hosts::
For physical or virtual EFI hosts::

. Set the first booting device as boot configuration with network.
. Depending on the EFI firmware type and configuration, the OS installer typically configures the OS boot loader as the first entry.
. Depending on the EFI firmware type and configuration, the operating system installer typically configures the operating system boot loader as the first entry.
. To reboot into installer again, use the `efibootmgr` utility to switch back to boot from network.
2 changes: 1 addition & 1 deletion guides/common/modules/ref_template-sync-settings.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[cols="30%,30%,40%",options="header"]
|====
| Setting | Default Value | Description
| *Associate* | New | Associate templates with OS, organization and location.
| *Associate* | New | Associate templates with operating system, organization and location.
| *Branch* | | Default branch in Git repo.
| *Commit message* | Templates export made by a {Project} user | Custom commit message for exported templates.
| *Dirname* | / | The directory within the Git repo containing the templates.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ To perform the Secure Boot, the boot loader must be manually signed and key enro
Alternatively, grub2 from Ubuntu or {EL} can be copied to perform booting.

Grub2 in {EL} 8.0-8.3 were updated to mitigate https://access.redhat.com/security/vulnerabilities/grub2bootloader[Boot Hole Vulnerability] and keys of existing {EL} kernels were invalidated.
To boot any of the affected {EL} kernel (or OS installer), you must enroll keys manually into the EFI firmware for each host:
To boot any of the affected {EL} kernel (or operating system installer), you must enroll keys manually into the EFI firmware for each host:
+
[options="nowrap" subs="+quotes,attributes"]
----
Expand Down
2 changes: 1 addition & 1 deletion guides/doc-Quickstart/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include::common/header.adoc[]
= {QuickstartDocTitle}

The Foreman installer is a collection of Puppet modules that installs everything required for a full working Foreman setup.
It uses native OS packaging (`.rpm` or `.deb` packages) and adds necessary configuration for the complete installation.
It uses native operating system packaging (`.rpm` or `.deb` packages) and adds necessary configuration for the complete installation.

Components include the Foreman web UI, Smart Proxy, a Puppet server, TFTP, DNS and DHCP servers.
It is configurable and the Puppet modules can be read or run in "no-op" mode to see what changes it will make.
Expand Down

0 comments on commit fd91a2a

Please sign in to comment.