Attachment 222720 Details for Bug 253760 – patch to fix path to /usr/share

[patch] patch to fix path to /usr/share

shared.diff (text/plain), 37.13 KB, created by Ceri Davies on 2021-02-22 11:12:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ceri Davies

Created: 2021-02-22 11:12:13 UTC

Size: 37.13 KB

patch

obsolete

>diff --git a/documentation/content/en/articles/fonts/_index.adoc b/documentation/content/en/articles/fonts/_index.adoc
>index 9ff3afd3c8..846046013f 100644
>--- a/documentation/content/en/articles/fonts/_index.adoc
>+++ b/documentation/content/en/articles/fonts/_index.adoc
>@@ -93,7 +93,7 @@ First, an 8x8 font must be loaded. To do this, [.filename]#/etc/rc.conf# should
> 
> [.programlisting]
> ....
>-font8x8="iso-8x8"		# font 8x8 from /usr/shared/syscons/fonts/* (or NO).
>+font8x8="iso-8x8"		# font 8x8 from /usr/share/syscons/fonts/* (or NO).
> ....
> 
> The command to actually switch the mode is man:vidcontrol[1]:
>@@ -299,7 +299,7 @@ References: [.filename]#fonts.txt# in the Ghostscript 4.01 distribution
> [[type1-fonts-groff]]
> == Using Type 1 Fonts with Groff
> 
>-Now that the new font can be used by both X11 and Ghostscript, how can one use the new font with groff? First of all, since we are dealing with type 1 PostScript(R) fonts, the groff device that is applicable is the _ps_ device. A font file must be created for each font that groff can use. A groff font name is just a file in [.filename]#/usr/shared/groff_font/devps#. With our example, the font file could be [.filename]#/usr/shared/groff_font/devps/SHOWBOAT#. The file must be created using tools provided by groff.
>+Now that the new font can be used by both X11 and Ghostscript, how can one use the new font with groff? First of all, since we are dealing with type 1 PostScript(R) fonts, the groff device that is applicable is the _ps_ device. A font file must be created for each font that groff can use. A groff font name is just a file in [.filename]#/usr/share/groff_font/devps#. With our example, the font file could be [.filename]#/usr/share/groff_font/devps/SHOWBOAT#. The file must be created using tools provided by groff.
> 
> The first tool is `afmtodit`. This is not normally installed, so it must be retrieved from the source distribution. I found I had to change the first line of the file, so I did:
> 
>@@ -324,7 +324,7 @@ We need to convert them to UNIX(R) style ^J delimited lines
> 	tr '\015' '\012' >showboat.afm
> 
> Now create the groff font file
>-% cd /usr/shared/groff_font/devps
>+% cd /usr/share/groff_font/devps
> % /tmp/afmtodit.pl -d DESC -e text.enc /tmp/showboat.afm generate/textmap SHOWBOAT
> ....
> 
>@@ -430,7 +430,7 @@ In the work area, you will need to make the utility. Just type:
> # make -f Makefile.sub afmtodit
> ....
> +
>-You may also need to copy [.filename]#/usr/contrib/groff/devps/generate/textmap# to [.filename]#/usr/shared/groff_font/devps/generate# if it does not already exist.
>+You may also need to copy [.filename]#/usr/contrib/groff/devps/generate/textmap# to [.filename]#/usr/share/groff_font/devps/generate# if it does not already exist.
> 
> Once all these utilities are in place, you are ready to commence:
> 
>@@ -469,7 +469,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
> 
> . Create the groff PostScript file:
> + 
>-Change directories to [.filename]#/usr/shared/groff_font/devps# so as to make the following command easier to execute. You will probably need root privileges for this. (Or, if you are paranoid about working there, make sure you reference the files [.filename]#DESC#, [.filename]#text.enc# and [.filename]#generate/textmap# as being in this directory.)
>+Change directories to [.filename]#/usr/share/groff_font/devps# so as to make the following command easier to execute. You will probably need root privileges for this. (Or, if you are paranoid about working there, make sure you reference the files [.filename]#DESC#, [.filename]#text.enc# and [.filename]#generate/textmap# as being in this directory.)
> +
> [source,bash]
> ....
>@@ -483,7 +483,7 @@ Where, [.filename]#file.afm# is the _AFM_name_ created by `ttf2pf.ps` above, and
> % afmtodit -d DESC -e text.enc 3of9.afm generate/textmap 3of9
> ....
> + 
>-Ensure that the resulting _PS_font_name_ file (e.g., [.filename]#3of9# in the example above) is located in the directory [.filename]#/usr/shared/groff_font/devps# by copying or moving it there.
>+Ensure that the resulting _PS_font_name_ file (e.g., [.filename]#3of9# in the example above) is located in the directory [.filename]#/usr/share/groff_font/devps# by copying or moving it there.
> + 
> Note that if [.filename]#ttf2pf.ps# assigns a font name using the one it finds in the TrueType font file and you want to use a different name, you must edit the [.filename]#.afm# prior to running `afmtodit`. This name must also match the one used in the Fontmap file if you wish to pipe man:groff[1] into man:gs[1].
> 
>diff --git a/documentation/content/en/articles/rc-scripting/_index.adoc b/documentation/content/en/articles/rc-scripting/_index.adoc
>index 1106c92505..7bd655e21d 100644
>--- a/documentation/content/en/articles/rc-scripting/_index.adoc
>+++ b/documentation/content/en/articles/rc-scripting/_index.adoc
>@@ -271,7 +271,7 @@ command_args="mock arguments > /dev/null 2>&1" <.>
> 
> pidfile="/var/run/${name}.pid" <.>
> 
>-required_files="/etc/${name}.conf /usr/shared/misc/${name}.rules" <.>
>+required_files="/etc/${name}.conf /usr/share/misc/${name}.rules" <.>
> 
> sig_reload="USR1" <.>
> 
>diff --git a/documentation/content/en/books/developers-handbook/l10n/chapter.adoc b/documentation/content/en/books/developers-handbook/l10n/chapter.adoc
>index 4966af0aa2..3903ed3d75 100644
>--- a/documentation/content/en/books/developers-handbook/l10n/chapter.adoc
>+++ b/documentation/content/en/books/developers-handbook/l10n/chapter.adoc
>@@ -78,7 +78,7 @@ The language catalog files have to be compiled into a binary form before they ca
> [[nls-using]]
> === Using the Catalog Files from the Source Code
> 
>-Using the catalog files is simple. To use the related functions, [.filename]#nl_types.h# must be included. Before using a catalog, it has to be opened with man:catopen[3]. The function takes two arguments. The first parameter is the name of the installed and compiled catalog. Usually, the name of the program is used, such as grep. This name will be used when looking for the compiled catalog file. The man:catopen[3] call looks for this file in [.filename]#/usr/shared/nls/locale/catname# and in [.filename]#/usr/local/shared/nls/locale/catname#, where `locale` is the locale set and `catname` is the catalog name being discussed. The second parameter is a constant, which can have two values:
>+Using the catalog files is simple. To use the related functions, [.filename]#nl_types.h# must be included. Before using a catalog, it has to be opened with man:catopen[3]. The function takes two arguments. The first parameter is the name of the installed and compiled catalog. Usually, the name of the program is used, such as grep. This name will be used when looking for the compiled catalog file. The man:catopen[3] call looks for this file in [.filename]#/usr/share/nls/locale/catname# and in [.filename]#/usr/local/shared/nls/locale/catname#, where `locale` is the locale set and `catname` is the catalog name being discussed. The second parameter is a constant, which can have two values:
> 
> * `NL_CAT_LOCALE`, which means that the used catalog file will be based on `LC_MESSAGES`.
> * `0`, which means that `LANG` has to be used to open the proper catalog.
>diff --git a/documentation/content/en/books/developers-handbook/tools/chapter.adoc b/documentation/content/en/books/developers-handbook/tools/chapter.adoc
>index cb23112114..c24e655267 100644
>--- a/documentation/content/en/books/developers-handbook/tools/chapter.adoc
>+++ b/documentation/content/en/books/developers-handbook/tools/chapter.adoc
>@@ -578,13 +578,13 @@ Now I think you will agree that is rather impressive for a four line script!
> 
> The secret lies in the last line, which tells `make` to look in the system makefile called [.filename]#bsd.port.mk#. It is easy to overlook this line, but this is where all the clever stuff comes from-someone has written a makefile that tells `make` to do all the things above (plus a couple of other things I did not mention, including handling any errors that may occur) and anyone can get access to that just by putting a single line in their own make file!
> 
>-If you want to have a look at these system makefiles, they are in [.filename]#/usr/shared/mk#, but it is probably best to wait until you have had a bit of practice with makefiles, as they are very complicated (and if you do look at them, make sure you have a flask of strong coffee handy!)
>+If you want to have a look at these system makefiles, they are in [.filename]#/usr/share/mk#, but it is probably best to wait until you have had a bit of practice with makefiles, as they are very complicated (and if you do look at them, make sure you have a flask of strong coffee handy!)
> 
> === More Advanced Uses of `make`
> 
> `Make` is a very powerful tool, and can do much more than the simple example above shows. Unfortunately, there are several different versions of `make`, and they all differ considerably. The best way to learn what they can do is probably to read the documentation-hopefully this introduction will have given you a base from which you can do this.
> 
>-The version of make that comes with FreeBSD is the Berkeley make; there is a tutorial for it in [.filename]#/usr/shared/doc/psd/12.make#. To view it, do
>+The version of make that comes with FreeBSD is the Berkeley make; there is a tutorial for it in [.filename]#/usr/share/doc/psd/12.make#. To view it, do
> 
> [source,bash]
> ....
>diff --git a/documentation/content/en/books/faq/_index.adoc b/documentation/content/en/books/faq/_index.adoc
>index b3f7f1b99b..48c7675599 100644
>--- a/documentation/content/en/books/faq/_index.adoc
>+++ b/documentation/content/en/books/faq/_index.adoc
>@@ -234,7 +234,7 @@ Yes. The documentation is available in a number of different formats and compres
> The documentation is categorized in a number of different ways. These include:
> 
> * The document's name, such as `faq`, or `handbook`.
>-* The document's language and encoding. These are based on the locale names found under [.filename]#/usr/shared/locale# on a FreeBSD system. The current languages and encodings are as follows:
>+* The document's language and encoding. These are based on the locale names found under [.filename]#/usr/share/locale# on a FreeBSD system. The current languages and encodings are as follows:
> +
> [.informaltable]
> [cols="1,1", frame="none", options="header"]
>@@ -926,7 +926,7 @@ To build and install only the specified modules, list them in [.filename]#/etc/m
> MODULES_OVERRIDE= accf_http ipfw
> ....
> 
>-Replace _accf_httpd ipfw_ with a list of needed modules. Only the listed modules will be built. This reduces the size of the kernel directory and decreases the amount of time needed to build the kernel. For more information, read [.filename]#/usr/shared/examples/etc/make.conf#.
>+Replace _accf_httpd ipfw_ with a list of needed modules. Only the listed modules will be built. This reduces the size of the kernel directory and decreases the amount of time needed to build the kernel. For more information, read [.filename]#/usr/share/examples/etc/make.conf#.
> 
> Unneeded devices can be removed from the kernel to further reduce the size. See <<make-kernel>> for more information.
> 
>@@ -2325,7 +2325,7 @@ In summary, the image can be used in a tasteful manner, for personal use, so lon
> [[daemon-images]]
> === Do you have any BSD daemon images I could use?
> 
>-Xfig and eps drawings are available under [.filename]#/usr/shared/examples/BSD_daemon/#.
>+Xfig and eps drawings are available under [.filename]#/usr/share/examples/BSD_daemon/#.
> 
> [[glossary]]
> === I have seen an acronym or other term on the mailing lists and I do not understand what it means. Where should I look?
>diff --git a/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc b/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc
>index bc18d76671..915bf07fc7 100644
>--- a/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc
>+++ b/documentation/content/en/books/fdp-primer/manual-pages/chapter.adoc
>@@ -238,7 +238,7 @@ Note how the commas at the end of the `.Xr` lines have been placed after a space
> [[manual-pages-markup-important-macros]]
> === Important Macros
> 
>-Some very common macros will be shown here. For more usage examples, see man:mdoc[7], man:groff_mdoc[7], or search for actual use in [.filename]#/usr/shared/man/man*# directories. For example, to search for examples of the `.Bd`_Begin display_ macro:
>+Some very common macros will be shown here. For more usage examples, see man:mdoc[7], man:groff_mdoc[7], or search for actual use in [.filename]#/usr/share/man/man*# directories. For example, to search for examples of the `.Bd`_Begin display_ macro:
> 
> [source,bash]
> ....
>diff --git a/documentation/content/en/books/fdp-primer/translations/chapter.adoc b/documentation/content/en/books/fdp-primer/translations/chapter.adoc
>index 117a0e8f0e..795df33834 100644
>--- a/documentation/content/en/books/fdp-primer/translations/chapter.adoc
>+++ b/documentation/content/en/books/fdp-primer/translations/chapter.adoc
>@@ -109,7 +109,7 @@ If you are the only person working on a particular language (or you are responsi
> 
> First, make sure your translation is organized properly. This means that it should drop into the existing documentation tree and build straight away.
> 
>-Currently, the FreeBSD documentation is stored in a top level directory called [.filename]#head/#. Directories below this are named according to the language code they are written in, as defined in ISO639 ([.filename]#/usr/shared/misc/iso639# on a version of FreeBSD newer than 20th January 1999).
>+Currently, the FreeBSD documentation is stored in a top level directory called [.filename]#head/#. Directories below this are named according to the language code they are written in, as defined in ISO639 ([.filename]#/usr/share/misc/iso639# on a version of FreeBSD newer than 20th January 1999).
> 
> If your language can be encoded in different ways (for example, Chinese) then there should be directories below this, one for each encoding format you have provided.
> 
>diff --git a/documentation/content/en/books/handbook/advanced-networking/_index.adoc b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
>index 28c608f755..3d2306d21c 100644
>--- a/documentation/content/en/books/handbook/advanced-networking/_index.adoc
>+++ b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
>@@ -1851,7 +1851,7 @@ The following examples use the Net-SNMP software (package:net-mgmt/net-snmp[]) t
> 
> [.programlisting]
> ....
>-mibdirs +/usr/shared/snmp/mibs
>+mibdirs +/usr/share/snmp/mibs
> mibs +BRIDGE-MIB:RSTP-MIB:BEGEMOT-MIB:BEGEMOT-BRIDGE-MIB
> ....
> 
>diff --git a/documentation/content/en/books/handbook/basics/_index.adoc b/documentation/content/en/books/handbook/basics/_index.adoc
>index ecec5d87ab..67787332e9 100644
>--- a/documentation/content/en/books/handbook/basics/_index.adoc
>+++ b/documentation/content/en/books/handbook/basics/_index.adoc
>@@ -305,7 +305,7 @@ FreeBSD provides a variety of different commands to manage user accounts. The mo
> [[users-adduser]]
> ==== `adduser`
> 
>-The recommended program for adding new users is man:adduser[8]. When a new user is added, this program automatically updates [.filename]#/etc/passwd# and [.filename]#/etc/group#. It also creates a home directory for the new user, copies in the default configuration files from [.filename]#/usr/shared/skel#, and can optionally mail the new user a welcome message. This utility must be run as the superuser.
>+The recommended program for adding new users is man:adduser[8]. When a new user is added, this program automatically updates [.filename]#/etc/passwd# and [.filename]#/etc/group#. It also creates a home directory for the new user, copies in the default configuration files from [.filename]#/usr/share/skel#, and can optionally mail the new user a welcome message. This utility must be run as the superuser.
> 
> The man:adduser[8] utility is interactive and walks through the steps for creating a new user account. As seen in <<users-modifying-adduser>>, either input the required information or press kbd:[Return] to accept the default value shown in square brackets. In this example, the user has been invited into the `wheel` group, allowing them to become the superuser with man:su[1]. When finished, the utility will prompt to either create another user or to exit.
> 
>@@ -921,7 +921,7 @@ A complete description of the file system hierarchy is available in man:hier[7].
> |[.filename]#/usr/sbin/#
> |System daemons and system utilities executed by users.
> 
>-|[.filename]#/usr/shared/#
>+|[.filename]#/usr/share/#
> |Architecture-independent files.
> 
> |[.filename]#/usr/src/#
>diff --git a/documentation/content/en/books/handbook/bibliography/_index.adoc b/documentation/content/en/books/handbook/bibliography/_index.adoc
>index 6908533790..15cbd02d02 100644
>--- a/documentation/content/en/books/handbook/bibliography/_index.adoc
>+++ b/documentation/content/en/books/handbook/bibliography/_index.adoc
>@@ -133,7 +133,7 @@ An Italian https://www.FreeBSD.org/doc/it_IT.ISO8859-15/books/unix-introduction/
> * Salus, Peter H. _A quarter century of UNIX_. Addison-Wesley Publishing Company, Inc., 1994. ISBN 0-201-54777-5
> * Simon Garfinkel, Daniel Weise, Steven Strassmann. _The UNIX-HATERS Handbook_. IDG Books Worldwide, Inc., 1994. ISBN 1-56884-203-1. Out of print, but available http://www.simson.net/ref/ugh.pdf[online].
> * Don Libes, Sandy Ressler _Life with UNIX_ - special edition. Prentice-Hall, Inc., 1989. ISBN 0-13-536657-7
>-* _The BSD family tree_. https://svnweb.freebsd.org/base/head/shared/misc/bsd-family-tree?view=co[https://svnweb.freebsd.org/base/head/shared/misc/bsd-family-tree?view=co] or link:file://localhost/usr/shared/misc/bsd-family-tree[/usr/shared/misc/bsd-family-tree] on a FreeBSD machine.
>+* _The BSD family tree_. https://svnweb.freebsd.org/base/head/shared/misc/bsd-family-tree?view=co[https://svnweb.freebsd.org/base/head/shared/misc/bsd-family-tree?view=co] or link:file://localhost/usr/share/misc/bsd-family-tree[/usr/share/misc/bsd-family-tree] on a FreeBSD machine.
> * _Networked Computer Science Technical Reports Library_.
> * _Old BSD releases from the Computer Systems Research group (CSRG)_. http://www.mckusick.com/csrg/[http://www.mckusick.com/csrg/]: The 4CD set covers all BSD versions from 1BSD to 4.4BSD and 4.4BSD-Lite2 (but not 2.11BSD, unfortunately). The last disk also holds the final sources plus the SCCS files.
> * Kernighan, Brian _Unix: A History and a Memoir_.  Kindle Direct Publishing, 2020.  ISBN 978-169597855-3
>diff --git a/documentation/content/en/books/handbook/config/_index.adoc b/documentation/content/en/books/handbook/config/_index.adoc
>index 76174b2a3b..d44ac80d4a 100644
>--- a/documentation/content/en/books/handbook/config/_index.adoc
>+++ b/documentation/content/en/books/handbook/config/_index.adoc
>@@ -501,7 +501,7 @@ ifconfig_dc1="inet 10.0.0.1 netmask 255.255.255.0 media 10baseT/UTP"
> 
> Replace [.filename]#dc0# and [.filename]#dc1# and the IP address information with the correct values for the system. Refer to the man page for the driver, man:ifconfig[8], and man:rc.conf[5] for more details about the allowed options and the syntax of [.filename]#/etc/rc.conf#.
> 
>-If the network is not using DNS, edit [.filename]#/etc/hosts# to add the names and IP addresses of the hosts on the LAN, if they are not already there. For more information, refer to man:hosts[5] and to [.filename]#/usr/shared/examples/etc/hosts#.
>+If the network is not using DNS, edit [.filename]#/etc/hosts# to add the names and IP addresses of the hosts on the LAN, if they are not already there. For more information, refer to man:hosts[5] and to [.filename]#/usr/share/examples/etc/hosts#.
> 
> [NOTE]
> ====
>@@ -572,7 +572,7 @@ PING 192.168.1.2 (192.168.1.2): 56 data bytes
> round-trip min/avg/max/stddev = 0.700/0.729/0.766/0.025 ms
> ....
> 
>-To test network resolution, use the host name instead of the IP address. If there is no DNS server on the network, [.filename]#/etc/hosts# must first be configured. To this purpose, edit [.filename]#/etc/hosts# to add the names and IP addresses of the hosts on the LAN, if they are not already there. For more information, refer to man:hosts[5] and to [.filename]#/usr/shared/examples/etc/hosts#.
>+To test network resolution, use the host name instead of the IP address. If there is no DNS server on the network, [.filename]#/etc/hosts# must first be configured. To this purpose, edit [.filename]#/etc/hosts# to add the names and IP addresses of the hosts on the LAN, if they are not already there. For more information, refer to man:hosts[5] and to [.filename]#/usr/share/examples/etc/hosts#.
> 
> ==== Troubleshooting
> 
>diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>index 28fb60e7c1..6d6b74f3f5 100644
>--- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>+++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc
>@@ -456,7 +456,7 @@ The list of languages and encodings to build and install, such as `en_US.ISO8859
> A single format or a list of output formats to be built. Currently, `html`, `html-split`, `txt`, `ps`, and `pdf` are supported.
> 
> `DOCDIR`::
>-Where to install the documentation. It defaults to [.filename]#/usr/shared/doc#.
>+Where to install the documentation. It defaults to [.filename]#/usr/share/doc#.
> 
> For more `make` variables supported as system-wide options in FreeBSD, refer to man:make.conf[5].
> 
>diff --git a/documentation/content/en/books/handbook/dtrace/_index.adoc b/documentation/content/en/books/handbook/dtrace/_index.adoc
>index 3a3dd2d186..33adc59fef 100644
>--- a/documentation/content/en/books/handbook/dtrace/_index.adoc
>+++ b/documentation/content/en/books/handbook/dtrace/_index.adoc
>@@ -107,11 +107,11 @@ This option provides support for `FBT`. While DTrace will work without this opti
> 
> Once the FreeBSD system has rebooted into the new kernel, or the DTrace kernel modules have been loaded using `kldload dtraceall`, the system will need support for the Korn shell as the DTrace Toolkit has several utilities written in `ksh`. Make sure that the package:shells/ksh93[] package or port is installed. It is also possible to run these tools under package:shells/pdksh[] or package:shells/mksh[].
> 
>-Finally, install the current DTrace Toolkit, a collection of ready-made scripts for collecting system information. There are scripts to check open files, memory, `CPU` usage, and a lot more. FreeBSD 10 installs a few of these scripts into [.filename]#/usr/shared/dtrace#. On other FreeBSD versions, or to install the full DTrace Toolkit, use the package:sysutils/DTraceToolkit[] package or port.
>+Finally, install the current DTrace Toolkit, a collection of ready-made scripts for collecting system information. There are scripts to check open files, memory, `CPU` usage, and a lot more. FreeBSD 10 installs a few of these scripts into [.filename]#/usr/share/dtrace#. On other FreeBSD versions, or to install the full DTrace Toolkit, use the package:sysutils/DTraceToolkit[] package or port.
> 
> [NOTE]
> ====
>-The scripts found in [.filename]#/usr/shared/dtrace# have been specifically ported to FreeBSD. Not all of the scripts found in the DTrace Toolkit will work as-is on FreeBSD and some scripts may require some effort in order for them to work on FreeBSD.
>+The scripts found in [.filename]#/usr/share/dtrace# have been specifically ported to FreeBSD. Not all of the scripts found in the DTrace Toolkit will work as-is on FreeBSD and some scripts may require some effort in order for them to work on FreeBSD.
> ====
> 
> The DTrace Toolkit includes many scripts in the special language of DTrace. This language is called the D language and it is very similar to C++. An in depth discussion of the language is beyond the scope of this document. It is covered extensively in the http://www.dtrace.org/guide[Illumos Dynamic Tracing Guide].
>diff --git a/documentation/content/en/books/handbook/firewalls/_index.adoc b/documentation/content/en/books/handbook/firewalls/_index.adoc
>index 65fb2fed25..9307e1a0d1 100644
>--- a/documentation/content/en/books/handbook/firewalls/_index.adoc
>+++ b/documentation/content/en/books/handbook/firewalls/_index.adoc
>@@ -152,7 +152,7 @@ Additional options, described in man:pfctl[8], can be passed to PF when it is st
> pf_flags=""                     # additional flags for pfctl startup
> ....
> 
>-PF will not start if it cannot find its ruleset configuration file. By default, FreeBSD does not ship with a ruleset and there is no [.filename]#/etc/pf.conf#. Example rulesets can be found in [.filename]#/usr/shared/examples/pf/#. If a custom ruleset has been saved somewhere else, add a line to [.filename]#/etc/rc.conf# which specifies the full path to the file:
>+PF will not start if it cannot find its ruleset configuration file. By default, FreeBSD does not ship with a ruleset and there is no [.filename]#/etc/pf.conf#. Example rulesets can be found in [.filename]#/usr/share/examples/pf/#. If a custom ruleset has been saved somewhere else, add a line to [.filename]#/etc/rc.conf# which specifies the full path to the file:
> 
> [.programlisting]
> ....
>@@ -189,7 +189,7 @@ After saving the needed edits, PF can be started with logging support by typing:
> # service pflog start
> ....
> 
>-By default, PF reads its configuration rules from [.filename]#/etc/pf.conf# and modifies, drops, or passes packets according to the rules or definitions specified in this file. The FreeBSD installation includes several sample files located in [.filename]#/usr/shared/examples/pf/#. Refer to the http://www.openbsd.org/faq/pf/[PF FAQ] for complete coverage of PF rulesets.
>+By default, PF reads its configuration rules from [.filename]#/etc/pf.conf# and modifies, drops, or passes packets according to the rules or definitions specified in this file. The FreeBSD installation includes several sample files located in [.filename]#/usr/share/examples/pf/#. Refer to the http://www.openbsd.org/faq/pf/[PF FAQ] for complete coverage of PF rulesets.
> 
> To control PF, use `pfctl`. <<pfctl>> summarizes some useful options to this command. Refer to man:pfctl[8] for a description of all available options:
> [[pfctl]]
>@@ -1604,7 +1604,7 @@ Refer to man:ipf[8] for details on the other flags available with this command.
> 
> === IPF Rule Syntax
> 
>-This section describes the IPF rule syntax used to create stateful rules. When creating rules, keep in mind that unless the `quick` keyword appears in a rule, every rule is read in order, with the _last matching rule_ being the one that is applied. This means that even if the first rule to match a packet is a `pass`, if there is a later matching rule that is a `block`, the packet will be dropped. Sample rulesets can be found in [.filename]#/usr/shared/examples/ipfilter#.
>+This section describes the IPF rule syntax used to create stateful rules. When creating rules, keep in mind that unless the `quick` keyword appears in a rule, every rule is read in order, with the _last matching rule_ being the one that is applied. This means that even if the first rule to match a packet is a `pass`, if there is a later matching rule that is a `block`, the packet will be dropped. Sample rulesets can be found in [.filename]#/usr/share/examples/ipfilter#.
> 
> When creating rules, a `#` character is used to mark the start of a comment and may appear at the end of a rule, to explain that rule's function, or on its own line. Any blank lines are ignored.
> 
>diff --git a/documentation/content/en/books/handbook/l10n/_index.adoc b/documentation/content/en/books/handbook/l10n/_index.adoc
>index 80501c84b1..fa8828802a 100644
>--- a/documentation/content/en/books/handbook/l10n/_index.adoc
>+++ b/documentation/content/en/books/handbook/l10n/_index.adoc
>@@ -580,4 +580,4 @@ Japanese and Korean Language Localization::
> For Japanese, refer to http://www.jp.FreeBSD.org/[http://www.jp.FreeBSD.org/], and for Korean, refer to http://www.kr.FreeBSD.org/[http://www.kr.FreeBSD.org/].
> 
> Non-English FreeBSD Documentation::
>-Some FreeBSD contributors have translated parts of the FreeBSD documentation to other languages. They are available through links on the link:https://www.FreeBSD.org/[FreeBSD web site] or in [.filename]#/usr/shared/doc#.
>+Some FreeBSD contributors have translated parts of the FreeBSD documentation to other languages. They are available through links on the link:https://www.FreeBSD.org/[FreeBSD web site] or in [.filename]#/usr/share/doc#.
>diff --git a/documentation/content/en/books/handbook/mac/_index.adoc b/documentation/content/en/books/handbook/mac/_index.adoc
>index e38a745f61..60c1d46c07 100644
>--- a/documentation/content/en/books/handbook/mac/_index.adoc
>+++ b/documentation/content/en/books/handbook/mac/_index.adoc
>@@ -187,7 +187,7 @@ default:\
> 	:welcome=/etc/motd:\
> 	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
> 	:path=~/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:\
>-	:manpath=/usr/shared/man /usr/local/man:\
>+	:manpath=/usr/share/man /usr/local/man:\
> 	:nologin=/usr/sbin/nologin:\
> 	:cputime=1h30m:\
> 	:datasize=8M:\
>@@ -609,7 +609,7 @@ insecure:\
> :welcome=/etc/motd:\
> :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
> :path=~/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
>-:manpath=/usr/shared/man /usr/local/man:\
>+:manpath=/usr/share/man /usr/local/man:\
> :nologin=/usr/sbin/nologin:\
> :cputime=1h30m:\
> :datasize=8M:\
>diff --git a/documentation/content/en/books/handbook/ports/_index.adoc b/documentation/content/en/books/handbook/ports/_index.adoc
>index 17fb3863ef..ef304f4b65 100644
>--- a/documentation/content/en/books/handbook/ports/_index.adoc
>+++ b/documentation/content/en/books/handbook/ports/_index.adoc
>@@ -316,7 +316,7 @@ FreeBSD: {
>   url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
>   mirror_type: "srv",
>   signature_type: "fingerprints",
>-  fingerprints: "/usr/shared/keys/pkg",
>+  fingerprints: "/usr/share/keys/pkg",
>   enabled: yes
> }
> ....
>@@ -1039,8 +1039,8 @@ The following files will be added as part of updating to
> The following files will be updated as part of updating to
> 11.4-RELEASE-p1:
> [â¦]
>-Installing updates...Scanning //usr/shared/certs/blacklisted for certificates...
>-Scanning //usr/shared/certs/trusted for certificates...
>+Installing updates...Scanning //usr/share/certs/blacklisted for certificates...
>+Scanning //usr/share/certs/trusted for certificates...
>  done.
> 11.4-RELEASE-p1
> [00:04:06] Recording filesystem state for clean... done
>diff --git a/documentation/content/en/books/handbook/ppp-and-slip/_index.adoc b/documentation/content/en/books/handbook/ppp-and-slip/_index.adoc
>index 0d058a254b..bb6502f17f 100644
>--- a/documentation/content/en/books/handbook/ppp-and-slip/_index.adoc
>+++ b/documentation/content/en/books/handbook/ppp-and-slip/_index.adoc
>@@ -80,7 +80,7 @@ The following information may be supplied by the ISP, but is not necessary:
> + 
> If the ISP has assigned a static IP address and hostname, it should be input into the configuration file. Otherwise, this information will be automatically provided during connection setup.
> 
>-The rest of this section demonstrates how to configure FreeBSD for common PPP connection scenarios. The required configuration file is [.filename]#/etc/ppp/ppp.conf# and additional files and examples are available in [.filename]#/usr/shared/examples/ppp/#.
>+The rest of this section demonstrates how to configure FreeBSD for common PPP connection scenarios. The required configuration file is [.filename]#/etc/ppp/ppp.conf# and additional files and examples are available in [.filename]#/usr/share/examples/ppp/#.
> 
> [NOTE]
> ====
>@@ -184,7 +184,7 @@ provider:
>       add default HISADDR
> ....
> 
>-This file is also needed when the default gateway address is "guessed" in a static IP address configuration. In this case, remove line 17 from [.filename]#ppp.conf# and create [.filename]#/etc/ppp/ppp.linkup# with the above two lines. More examples for this file can be found in [.filename]#/usr/shared/examples/ppp/#.
>+This file is also needed when the default gateway address is "guessed" in a static IP address configuration. In this case, remove line 17 from [.filename]#ppp.conf# and create [.filename]#/etc/ppp/ppp.linkup# with the above two lines. More examples for this file can be found in [.filename]#/usr/share/examples/ppp/#.
> 
> By default, `ppp` must be run as `root`. To change this default, add the account of the user who should run `ppp` to the `network` group in [.filename]#/etc/group#.
> 
>@@ -429,7 +429,7 @@ Each user logging in with this method will need to have a username/password in [
> enable passwdauth
> ....
> 
>-To assign some users a static IP number, specify the number as the third argument in [.filename]#/etc/ppp/ppp.secret#. See [.filename]#/usr/shared/examples/ppp/ppp.secret.sample# for examples.
>+To assign some users a static IP number, specify the number as the third argument in [.filename]#/etc/ppp/ppp.secret#. See [.filename]#/usr/share/examples/ppp/ppp.secret.sample# for examples.
> 
> [[ppp-troubleshoot]]
> == Troubleshooting PPP Connections
>diff --git a/documentation/content/en/books/handbook/printing/_index.adoc b/documentation/content/en/books/handbook/printing/_index.adoc
>index a7ecd2529d..e230fcb75f 100644
>--- a/documentation/content/en/books/handbook/printing/_index.adoc
>+++ b/documentation/content/en/books/handbook/printing/_index.adoc
>@@ -734,16 +734,16 @@ It can be difficult for users to locate their documents in the stack of pages pr
> 
> Enabling header pages differs depending on whether the printer is connected directly to the computer with a `USB`, parallel, or serial cable, or is connected remotely over a network.
> 
>-Header pages on directly-connected printers are enabled by removing the `:sh:\` (Suppress Header) line from the entry in [.filename]#/etc/printcap#. These header pages only use line feed characters for new lines. Some printers will need the [.filename]#/usr/shared/examples/printing/hpif# filter to prevent stairstepped text. The filter configures `PCL` printers to print both carriage returns and line feeds when a line feed is received.
>+Header pages on directly-connected printers are enabled by removing the `:sh:\` (Suppress Header) line from the entry in [.filename]#/etc/printcap#. These header pages only use line feed characters for new lines. Some printers will need the [.filename]#/usr/share/examples/printing/hpif# filter to prevent stairstepped text. The filter configures `PCL` printers to print both carriage returns and line feeds when a line feed is received.
> 
> Header pages for network printers must be configured on the printer itself. Header page entries in [.filename]#/etc/printcap# are ignored. Settings are usually available from the printer front panel or a configuration web page accessible with a web browser.
> 
> [[printing-lpd-references]]
> === References
> 
>-Example files: [.filename]#/usr/shared/examples/printing/#.
>+Example files: [.filename]#/usr/share/examples/printing/#.
> 
>-The _4.3BSD Line Printer Spooler Manual_, [.filename]#/usr/shared/doc/smm/07.lpd/paper.ascii.gz#.
>+The _4.3BSD Line Printer Spooler Manual_, [.filename]#/usr/share/doc/smm/07.lpd/paper.ascii.gz#.
> 
> Manual pages: man:printcap[5], man:lpd[8], man:lpr[1], man:lpc[8], man:lprm[1], man:lpq[1].
> 
>diff --git a/documentation/content/en/books/handbook/security/_index.adoc b/documentation/content/en/books/handbook/security/_index.adoc
>index 1efe19cf19..d07f9f0413 100644
>--- a/documentation/content/en/books/handbook/security/_index.adoc
>+++ b/documentation/content/en/books/handbook/security/_index.adoc
>@@ -819,7 +819,7 @@ When configuring and troubleshooting Kerberos, keep the following points in mind
> * With MITKerberos, to allow a principal to have a ticket life longer than the default lifetime of ten hours, use `modify_principal` at the man:kadmin[8] prompt to change the `maxlife` of both the principal in question and the `krbtgt` principal. The principal can then use `kinit -l` to request a ticket with a longer lifetime.
> * When running a packet sniffer on the KDC to aid in troubleshooting while running `kinit` from a workstation, the Ticket Granting Ticket (TGT) is sent immediately, even before the password is typed. This is because the Kerberos server freely transmits a TGT to any unauthorized request. However, every TGT is encrypted in a key derived from the user's password. When a user types their password, it is not sent to the KDC, it is instead used to decrypt the TGT that `kinit` already obtained. If the decryption process results in a valid ticket with a valid time stamp, the user has valid Kerberos credentials. These credentials include a session key for establishing secure communications with the Kerberos server in the future, as well as the actual TGT, which is encrypted with the Kerberos server's own key. This second layer of encryption allows the Kerberos server to verify the authenticity of each TGT.
> * Host principals can have a longer ticket lifetime. If the user principal has a lifetime of a week but the host being connected to has a lifetime of nine hours, the user cache will have an expired host principal and the ticket cache will not work as expected.
>-* When setting up [.filename]#krb5.dict# to prevent specific bad passwords from being used as described in man:kadmind[8], remember that it only applies to principals that have a password policy assigned to them. The format used in [.filename]#krb5.dict# is one string per line. Creating a symbolic link to [.filename]#/usr/shared/dict/words# might be useful.
>+* When setting up [.filename]#krb5.dict# to prevent specific bad passwords from being used as described in man:kadmind[8], remember that it only applies to principals that have a password policy assigned to them. The format used in [.filename]#krb5.dict# is one string per line. Creating a symbolic link to [.filename]#/usr/share/dict/words# might be useful.
> 
> === Mitigating Kerberos Limitations
>

Actions: View | Diff

Attachments on bug 253760: 222720