git: 1e27e564c1 - main - Remove empty lines and extra whitespaces at the end of some lines
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 Dec 2023 17:15:54 UTC
The branch main has been updated by bcr:
URL: https://cgit.FreeBSD.org/doc/commit/?id=1e27e564c179325b977e6264936524521bda3829
commit 1e27e564c179325b977e6264936524521bda3829
Author: Benedict Reuschling <bcr@FreeBSD.org>
AuthorDate: 2023-12-28 17:15:22 +0000
Commit: Benedict Reuschling <bcr@FreeBSD.org>
CommitDate: 2023-12-28 17:15:22 +0000
Remove empty lines and extra whitespaces at the end of some lines
---
.../content/en/books/handbook/basics/_index.adoc | 24 +++++++++++-----------
.../en/books/handbook/bsdinstall/_index.adoc | 4 ++--
.../en/books/handbook/serialcomms/_index.adoc | 14 ++++++-------
.../content/en/books/handbook/wayland/_index.adoc | 4 ++--
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/documentation/content/en/books/handbook/basics/_index.adoc b/documentation/content/en/books/handbook/basics/_index.adoc
index 4eee8f3079..421f4c5f3e 100644
--- a/documentation/content/en/books/handbook/basics/_index.adoc
+++ b/documentation/content/en/books/handbook/basics/_index.adoc
@@ -254,7 +254,7 @@ Every user account on a FreeBSD system has certain information associated with i
User name::
The user name is typed at the `login:` prompt.
-Each user must have a unique user name.
+Each user must have a unique user name.
There are a number of rules for creating valid user names which are documented in man:passwd[5].
It is recommended to use user names that consist of eight or fewer, all lower case characters in order to maintain backwards compatibility with applications.
@@ -262,7 +262,7 @@ Password::
Each account has an associated password.
User ID (UID)::
-The User ID (UID) is a number used to uniquely identify the user to the FreeBSD system.
+The User ID (UID) is a number used to uniquely identify the user to the FreeBSD system.
Commands that allow a user name to be specified will first convert it to the UID.
It is recommended to use a UID less than 65535, since higher values may cause compatibility issues with some software.
@@ -721,7 +721,7 @@ For more information about this command and the format of `/etc/group`, refer to
[[permissions]]
== Permissions
-In FreeBSD, every file and directory has an associated set of permissions and several utilities are available for viewing and modifying these permissions.
+In FreeBSD, every file and directory has an associated set of permissions and several utilities are available for viewing and modifying these permissions.
Understanding how permissions work is necessary to make sure that users are able to access the files that they need and are unable to improperly access the files used by the operating system or owned by other users.
This section discusses the traditional UNIX(R) permissions used in FreeBSD.
@@ -803,7 +803,7 @@ A dash means that the permission is turned off.
In this example, the permissions are set so the owner can read and write to the file, the group can read the file, and the rest of the world can only read the file.
According to the table above, the permissions for this file would be `644`, where each digit represents the three parts of the file's permission.
-How does the system control permissions on devices? FreeBSD treats most hardware devices as a file that programs can open, read, and write data to.
+How does the system control permissions on devices? FreeBSD treats most hardware devices as a file that programs can open, read, and write data to.
These special device files are stored in `/dev/`.
Directories are also treated as files.
@@ -947,7 +947,7 @@ However, in order to update the password database, the command runs as the effec
This allows users to change their passwords without seeing a `Permission Denied` error.
The setuid permission may be added symbolically by adding the `s` permission for the user as in the following example:
-
+
[source,shell]
....
# chmod u+s suidexample.sh
@@ -1012,7 +1012,7 @@ To set the `setgid` permission on a file symbolically, add the `s` permission fo
....
# chmod g+s sgidexample.sh
....
-
+
Alternatively, provide man:chmod[1] with a leading two (2):
[source,shell]
@@ -1069,7 +1069,7 @@ drwxrwxrwt 10 root wheel 512 Aug 31 01:49 tmp
The FreeBSD directory hierarchy is fundamental to obtaining an overall understanding of the system.
The most important directory is root or, "/".
-This directory is the first one mounted at boot time and it contains the base system necessary to prepare the operating system for multi-user operation.
+This directory is the first one mounted at boot time and it contains the base system necessary to prepare the operating system for multi-user operation.
The root directory also contains mount points for other file systems that are mounted during the transition to multi-user operation.
A mount point is a directory where additional file systems can be grafted onto a parent file system (usually the root file system).
@@ -1077,7 +1077,7 @@ This is further described in <<disk-organization>>.
Standard mount points include `/usr/`, `/var/`, `/tmp/`, `/mnt/`, and `/cdrom/`.
These directories are usually referenced to entries in `/etc/fstab`.
This file is a table of various file systems and mount points and is read by the system.
-Most of the file systems in `/etc/fstab` are mounted automatically at boot time from the script man:rc[8] unless their entry includes `noauto`.
+Most of the file systems in `/etc/fstab` are mounted automatically at boot time from the script man:rc[8] unless their entry includes `noauto`.
Details can be found in <<disks-fstab>>.
A complete description of the file system hierarchy is available in man:hier[7].
@@ -1279,7 +1279,7 @@ MBR, however, supports only a small number of partitions.
The MBR partitions are known in FreeBSD as `slices`.
Slices may be used for different operating systems.
FreeBSD slices are subdivided into partitions using BSD labels (see man:bsdlabel[8]).
-
+
Slice numbers follow the device name, prefixed with an `s`, starting at 1.
So "da0__s1__" is the first slice on the first SCSI drive.
There can only be four physical slices on a disk, but there can be logical slices inside physical slices of the appropriate type.
@@ -1405,7 +1405,7 @@ image::disk-layout.png[Layout of a shared drive between Windows and FreeBSD]
The file system is best visualized as a tree, rooted, as it were, at `/`. `/dev`, `/usr`, and the other directories in the root directory are branches, which may have their own branches, such as `/usr/local`, and so on.
There are various reasons to house some of these directories on separate file systems.
-`/var` contains the directories `log/`, `spool/`, and various types of temporary files, and as such, may get filled up.
+`/var` contains the directories `log/`, `spool/`, and various types of temporary files, and as such, may get filled up.
Filling up the root file system is not a good idea, so splitting `/var` from `/` is often favorable.
Another common reason to contain certain directory trees on other file systems is if they are to be housed on separate physical disks, or are separate virtual disks, such as Network File System mounts, described in crossref:network-servers[network-nfs,“Network File System (NFS)”], or CDROM drives.
@@ -1670,7 +1670,7 @@ A Linux(R) user might prefer `bash`.
Each shell has unique properties that may or may not work with a user's preferred working environment, which is why there is a choice of which shell to use.
One common shell feature is filename completion.
-After a user types the first few letters of a command or filename and presses kbd:[Tab], the shell completes the rest of the command or filename.
+After a user types the first few letters of a command or filename and presses kbd:[Tab], the shell completes the rest of the command or filename.
Consider two files called `foobar` and `football`.
To delete `foobar`, the user might type `rm foo` and press kbd:[Tab] to complete the filename.
@@ -1824,7 +1824,7 @@ Output could be a screen or paper in a printer.
And error would be anything that is used for diagnostic or error messages.
All three are considered I/O based file descriptors and sometimes considered streams.
-Through the use of these descriptors, the shell allows output and input to be passed around through various commands and redirected to or from a file.
+Through the use of these descriptors, the shell allows output and input to be passed around through various commands and redirected to or from a file.
Another method of redirection is the pipe operator.
The UNIX(R) pipe operator, "|" allows the output of one command to be directly passed or directed to another program.
diff --git a/documentation/content/en/books/handbook/bsdinstall/_index.adoc b/documentation/content/en/books/handbook/bsdinstall/_index.adoc
index 93b8caeab2..2092d066d3 100644
--- a/documentation/content/en/books/handbook/bsdinstall/_index.adoc
+++ b/documentation/content/en/books/handbook/bsdinstall/_index.adoc
@@ -465,7 +465,7 @@ Large software packages, like Firefox or LibreOffice may be tricky to install if
The `/usr` partition holds many of the files which support the system, including the FreeBSD Ports Collection and system source code.
At least 2 gigabytes of space is recommended for this partition.
-Also, note that home directories for users are placed in `/usr/home` by default, but can be placed on another partition.
+Also, note that home directories for users are placed in `/usr/home` by default, but can be placed on another partition.
By default, `/home` is a symbolic link to `/usr/home`.
When selecting partition sizes, keep the space requirements in mind.
@@ -581,7 +581,7 @@ The other partition schemes are generally used for uncommon or older computers.
|===
After the partitioning scheme has been selected and created, select btn:[Create] again to create the partitions.
-The kbd:[Tab] key is used to give focus to the fields (after cycling through btn:[<OK>], btn:[<Options>], and btn:[<Cancel>]).
+The kbd:[Tab] key is used to give focus to the fields (after cycling through btn:[<OK>], btn:[<Options>], and btn:[<Cancel>]).
[[bsdinstall-part-manual-addpart]]
.Manually Create Partitions
diff --git a/documentation/content/en/books/handbook/serialcomms/_index.adoc b/documentation/content/en/books/handbook/serialcomms/_index.adoc
index 5d1a81fd87..6f25eb72f6 100644
--- a/documentation/content/en/books/handbook/serialcomms/_index.adoc
+++ b/documentation/content/en/books/handbook/serialcomms/_index.adoc
@@ -153,7 +153,7 @@ When in doubt, refer to the documentation for the hardware.
|===
<| Signal
<| Pin #
-|
+|
<| Pin #
<| Signal
@@ -218,7 +218,7 @@ When in doubt, refer to the documentation for the hardware.
|===
<| Signal
<| Pin #
-|
+|
<| Pin #
<| Signal
@@ -283,7 +283,7 @@ When in doubt, refer to the documentation for the hardware.
|===
<| Signal
<| Pin #
-|
+|
<| Pin #
<| Signal
@@ -511,7 +511,7 @@ The computer is connected to the sixth serial port on a multi-port serial card.
[.programlisting]
....
-ttyu1 "/usr/libexec/getty std.38400" wy50 on insecure
+ttyu1 "/usr/libexec/getty std.38400" wy50 on insecure
ttyu5 "/usr/libexec/getty std.19200" vt100 on insecure
....
@@ -1037,7 +1037,7 @@ PS/2(R) mice share some hardware with the keyboard and leaving the mouse plugged
[NOTE]
====
While most systems will boot without a keyboard, quite a few will not boot without a graphics adapter.
-Some systems can be configured to boot with no graphics adapter by changing the "graphics adapter" setting in the BIOS configuration to "Not installed".
+Some systems can be configured to boot with no graphics adapter by changing the "graphics adapter" setting in the BIOS configuration to "Not installed".
Other systems do not support this option and will refuse to boot if there is no display hardware in the system.
With these machines, leave some kind of graphics card plugged in, even if it is just a junky mono board.
A monitor does not need to be attached.
@@ -1054,13 +1054,13 @@ When using multiple options, include them all on the same line:
`-h`:::
Toggles between the internal and serial consoles.
Use this to switch console devices.
-For instance, to boot from the internal (video) console, use `-h` to direct the boot loader and the kernel to use the serial port as its console device.
+For instance, to boot from the internal (video) console, use `-h` to direct the boot loader and the kernel to use the serial port as its console device.
Alternatively, to boot from the serial port, use `-h` to tell the boot loader and the kernel to use the video display as the console instead.
`-D`:::
Toggles between the single and dual console configurations.
In the single configuration, the console will be either the internal console (video display) or the serial port, depending on the state of `-h`.
-In the dual console configuration, both the video display and the serial port will become the console at the same time, regardless of the state of `-h`.
+In the dual console configuration, both the video display and the serial port will become the console at the same time, regardless of the state of `-h`.
However, the dual console configuration takes effect only while the boot block is running.
Once the boot loader gets control, the console specified by `-h` becomes the only console.
diff --git a/documentation/content/en/books/handbook/wayland/_index.adoc b/documentation/content/en/books/handbook/wayland/_index.adoc
index a1d2517b97..e8d9b0b02d 100644
--- a/documentation/content/en/books/handbook/wayland/_index.adoc
+++ b/documentation/content/en/books/handbook/wayland/_index.adoc
@@ -205,7 +205,7 @@ The first option will lock the screen after 300 seconds, and after another 300,
One final thing to note is the <super> key.
Most of the configuration mentions this key, and it is the traditional `Windows` key on the keyboard.
Most keyboards have this super key available; however, it should be remapped within this configuration file if it is not available.
-For example, to lock the screen, press and hold the super key, the kbd:[shift] key, and press the kbd:[escape] key.
+For example, to lock the screen, press and hold the super key, the kbd:[shift] key, and press the kbd:[escape] key.
nless the mappings have changed, this will execute the swaylock application.
The default configuration for `swaylock` will show a grey screen; however, the application is highly customizable and well documented.
In addition, since the swaylock-effects is the version that was installed, there are several options available such as the blur effect, which can be seen using the following command:
@@ -478,7 +478,7 @@ DISPLAY=:0
In this output, there is a default Wayland display and a display set for the Xwayland server.
Another method to verify that `Xwayland` is functioning properly is to use install and test the small package:[x11/eyes] and check the output.
If the `xeyes` application starts and the eyes follow the mouse pointer, Xwayland is functioning properly.
-If an error such as the following is displayed, something happened during the `Xwayland` intitialization and it may need reinstalled:
+If an error such as the following is displayed, something happened during the `Xwayland` initialization and it may need reinstalled:
[.programlisting]
....