Merge branch 'freebsd:main' into patch-9

freebsd · Jun 1, 2024 · 68f1a5c · 68f1a5c
2 parents 63240c2 + 0e01f51
commit 68f1a5c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/documentation/content/en/books/handbook/bsdinstall/_index.adoc b/documentation/content/en/books/handbook/bsdinstall/_index.adoc
@@ -283,7 +283,7 @@ When booting from CD or DVD, turn on the computer and insert the media at the fi
 How to configure the system to boot from the inserted media depends upon the architecture.
 
 [[bsdinstall-view-probe]]
-=== FreeBSD Boot Menu
+=== FreeBSD Boot Loader Menu
 
 Once the system boots from the installation media, a menu similar to the following will be displayed:
 

diff --git a/documentation/content/en/books/handbook/printing/_index.adoc b/documentation/content/en/books/handbook/printing/_index.adoc
@@ -297,8 +297,6 @@ However, printing an entire graphic-based page on these printers is often very s
 Host-based printers are often more difficult to set up.
 Some cannot be used at all because of proprietary PDLs.
 Avoid these printers when possible.
-
-Descriptions of many PDLs can be found at http://www.undocprint.org/formats/page_description_languages[].
 The particular `PDL` used by various models of printers can be found at http://www.openprinting.org/printers[].
 
 [[printing-direct]]

diff --git a/documentation/content/en/books/handbook/wayland/_index.adoc b/documentation/content/en/books/handbook/wayland/_index.adoc
@@ -49,7 +49,29 @@ include::../../../../../shared/asciidoctor.adoc[]
 endif::[]
 
 [[wayland-synopsis]]
-== Wayland Synopsis
+== Synopsis
+
+An installation of FreeBSD using bsdinstall does not automatically install a graphical user interface.
+This chapter describes how to select, install, and configure a Wayland compositor, which provides a graphical environment.
+
+Before reading this chapter, you should:
+
+* Know how to install crossref:ports[ports,additional third-party software].
+
+* How to identify and configure crossref:x11[x-graphic-card-drivers,drivers for your graphics hardware].
+
+After reading this chapter, you will know:
+
+* How to configure FreeBSD to host a Wayland graphical environment.
+
+* How to install and configure a Wayland compositor.
+
+* How to run programs designed for the older X Window System.
+
+* How to configure remote desktop access to a Wayland graphical environment.
+
+[[wayland-overview]]
+== Wayland Overview
 Wayland is a new display server, but it differs from Xorg in several important ways.
 First, Wayland is only a protocol that acts as an intermediary between clients using a different mechanism which removes the dependency on an X server.
 Xorg includes both the X11 protocol, used to run remote displays and the X server will accept connections and display windows.