From b0be160662220fe7107458caa90af1c1bf3c5b67 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Wed, 13 Nov 2024 12:48:39 -0800 Subject: [PATCH] manuals: Fix escaping for (some) backslashes According to mandoc_char(7), we should use '\e' rather than '\\'. The rendered output (in ascii and html) is not affected by this commit. Fixes made by script in https://github.com/Tarsnap/freebsd-doc-scripts, limited to 30 files. Signed-off-by: Graham Percival Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1526 --- bin/echo/echo.1 | 4 +- bin/ed/ed.1 | 12 +++--- bin/pax/pax.1 | 6 +-- bin/stty/stty.1 | 2 +- bin/timeout/timeout.1 | 2 +- lib/libc/gen/dlinfo.3 | 4 +- lib/libc/gen/ftw.3 | 4 +- lib/libc/stdlib/strfmon.3 | 4 +- lib/libcasper/services/cap_dns/cap_dns.3 | 2 +- lib/libcasper/services/cap_grp/cap_grp.3 | 2 +- lib/libcasper/services/cap_pwd/cap_pwd.3 | 2 +- .../services/cap_sysctl/cap_sysctl.3 | 2 +- lib/libdpv/dpv.3 | 4 +- lib/libgssapi/gss_display_status.3 | 2 +- lib/libmixer/mixer.3 | 2 +- .../pam_login_access/pam_login_access.8 | 2 +- lib/libstdbuf/libstdbuf.3 | 2 +- lib/libutil/login.conf.5 | 2 +- libexec/bootpd/bootptab.5 | 22 +++++----- libexec/comsat/comsat.8 | 2 +- sbin/ccdconfig/ccdconfig.8 | 2 +- sbin/dumpon/dumpon.8 | 2 +- sbin/ipf/ipf/ipf.5 | 40 +++++++++---------- sbin/ipf/ipsend/ipsend.5 | 4 +- sbin/ipfw/ipfw.8 | 2 +- sbin/mount_unionfs/mount_unionfs.8 | 2 +- sbin/routed/routed.8 | 4 +- share/man/man3/CMSG_DATA.3 | 4 +- share/man/man3/Q_INI.3 | 4 +- share/man/man3/qmath.3 | 8 ++-- 30 files changed, 78 insertions(+), 78 deletions(-) diff --git a/bin/echo/echo.1 b/bin/echo/echo.1 index cb60bdcc88dd1b..8572a3c5ce1263 100644 --- a/bin/echo/echo.1 +++ b/bin/echo/echo.1 @@ -92,7 +92,7 @@ manual page. .Sh EXAMPLES Special treatment of options and backslashes: .Bd -literal -offset indent -$ /bin/echo "-hello\\tworld" +$ /bin/echo "-hello\etworld" -hello\tworld .Ed .Pp @@ -104,7 +104,7 @@ helloworld .Pp Or to achieve the same result: .Bd -literal -offset indent -$ /bin/echo "hello\\c";/bin/echo world +$ /bin/echo "hello\ec";/bin/echo world helloworld .Ed .Sh SEE ALSO diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index 0db9f8d76bb82d..5bb12d8a8affba 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -158,7 +158,7 @@ the standard output of executed via .Xr sh 1 . To read a file whose name begins with a bang, prefix the -name with a backslash (\\). +name with a backslash (\e). The default filename is set to .Ar file only if it is not prefixed with a bang. @@ -485,7 +485,7 @@ All commands are single characters, though some require additional parameters. If a command's parameters extend over several lines, then each line except for the last -must be terminated with a backslash (\\). +must be terminated with a backslash (\e). .Pp In general, at most one command is allowed per line. However, most commands accept a print suffix, which is any of @@ -579,7 +579,7 @@ Each command in .Ar command-list must be on a separate line, and every line except for the last must be terminated by a backslash -(\\). +(\e). Any commands are allowed, except for .Em g , .Em G , @@ -765,7 +765,7 @@ then from the last substitution is used. Newlines may be embedded in .Ar replacement -if they are escaped with a backslash (\\). +if they are escaped with a backslash (\e). .It (.,.)s Repeat the last substitution. This form of the @@ -883,7 +883,7 @@ The .Nm utility does not process .Ar command -for backslash (\\) escapes. +for backslash (\e) escapes. However, an unescaped .Em % is replaced by the default filename. @@ -976,7 +976,7 @@ The utility processes .Ar file arguments for backslash escapes, i.e., in a filename, -any characters preceded by a backslash (\\) are +any characters preceded by a backslash (\e) are interpreted literally. .Pp If a text (non-binary) file is not terminated by a newline character, diff --git a/bin/pax/pax.1 b/bin/pax/pax.1 index 0981e9c0ae77f3..2e917c430a1770 100644 --- a/bin/pax/pax.1 +++ b/bin/pax/pax.1 @@ -611,7 +611,7 @@ As in .Cm old is a basic regular expression and .Cm new -can contain an ampersand (&), \\n (where n is a digit) back-references, +can contain an ampersand (&), \en (where n is a digit) back-references, or subexpression matching. The .Cm old @@ -850,7 +850,7 @@ Select a file based on its name, or when starting with a .Cm # , a numeric gid. -A '\\' can be used to escape the +A '\e' can be used to escape the .Cm # . Multiple .Fl G @@ -971,7 +971,7 @@ Select a file based on its name, or when starting with a .Cm # , a numeric uid. -A '\\' can be used to escape the +A '\e' can be used to escape the .Cm # . Multiple .Fl U diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index 4f0126dde275d8..97d565a2208877 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -330,7 +330,7 @@ Otherwise control characters echo as themselves. .It Cm echoprt Pq Fl echoprt For printing terminals. -If set, echo erased characters backwards within ``\\'' +If set, echo erased characters backwards within ``\e'' and ``/''. Otherwise, disable this feature. .It Cm noflsh Pq Fl noflsh diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 10e5fd70c3938d..179a27da4034e0 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -187,7 +187,7 @@ signal after 1 minute and send a .Va SIGKILL signal 5 seconds later if the process refuses to stop: .Bd -literal -offset indent -$ timeout -k 5s 1m fetch \\ +$ timeout -k 5s 1m fetch \e > https://download.freebsd.org/ftp/doc/en/books/handbook/book.pdf .Ed .Sh SEE ALSO diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3 index 8f30e5f10af1a0..19e9d5f2328460 100644 --- a/lib/libc/gen/dlinfo.3 +++ b/lib/libc/gen/dlinfo.3 @@ -225,7 +225,7 @@ Link_map *map; dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); while (map != NULL) { - printf("%p: %s\\n", map->l_addr, map->l_name); + printf("%p: %s\en", map->l_addr, map->l_name); map = map->l_next; } .Ed @@ -257,7 +257,7 @@ dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info); path = &info->dls_serpath[0]; for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { - (void) printf("%2d: %s\\n", cnt, path->dls_name); + (void) printf("%2d: %s\en", cnt, path->dls_name); } .Ed .Sh SEE ALSO diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3 index c9a1d6f1eee956..38db5daa8beb88 100644 --- a/lib/libc/gen/ftw.3 +++ b/lib/libc/gen/ftw.3 @@ -199,7 +199,7 @@ nftw_callback(const char *path, const struct stat *sb, int typeflag, struct FTW break; } - printf("[%c] %s\\n", type, path); + printf("[%c] %s\en", type, path); return (0); } @@ -209,7 +209,7 @@ main(int argc, char **argv) { if (argc != 2) { - printf("Usage %s \\n", argv[0]); + printf("Usage %s \en", argv[0]); return (EX_USAGE); } else return (nftw(argv[1], nftw_callback, /* UNUSED */ 1, 0)); diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3 index 20cc560d401d46..c7b4d7afca91a6 100644 --- a/lib/libc/stdlib/strfmon.3 +++ b/lib/libc/stdlib/strfmon.3 @@ -163,12 +163,12 @@ main(void) double money = 1234567.89; if (setlocale(LC_MONETARY, "en_US.UTF-8") == NULL) { - fprintf(stderr, "Unable to setlocale().\\n"); + fprintf(stderr, "Unable to setlocale().\en"); return (1); } strfmon(string, sizeof(string) - 1, "%n", money); - printf("%s\\n", string); + printf("%s\en", string); return (0); } diff --git a/lib/libcasper/services/cap_dns/cap_dns.3 b/lib/libcasper/services/cap_dns/cap_dns.3 index d6bbb6bd1263bf..3413a1851c31fb 100644 --- a/lib/libcasper/services/cap_dns/cap_dns.3 +++ b/lib/libcasper/services/cap_dns/cap_dns.3 @@ -213,7 +213,7 @@ error = cap_getnameinfo(capdns, res->ai_addr, res->ai_addrlen, hname, sizeof(hna if (error != 0) errx(1, "cap_getnameinfo(): %s: %s", ipstr, gai_strerror(error)); -printf("Name associated with %s is %s.\\n", ipstr, hname); +printf("Name associated with %s is %s.\en", ipstr, hname); .Ed .Sh SEE ALSO .Xr cap_enter 2 , diff --git a/lib/libcasper/services/cap_grp/cap_grp.3 b/lib/libcasper/services/cap_grp/cap_grp.3 index 578d8edffbfa45..ff794f430a72e6 100644 --- a/lib/libcasper/services/cap_grp/cap_grp.3 +++ b/lib/libcasper/services/cap_grp/cap_grp.3 @@ -202,7 +202,7 @@ group = cap_getgrgid(capgrp, gid[0]); if (group == NULL) err(1, "Unable to get name of group"); -printf("GID %d is associated with name %s.\\n", gid[0], group->gr_name); +printf("GID %d is associated with name %s.\en", gid[0], group->gr_name); cap_close(capgrp); .Ed diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.3 b/lib/libcasper/services/cap_pwd/cap_pwd.3 index b66a0cd083ba8b..b440f9643d7daa 100644 --- a/lib/libcasper/services/cap_pwd/cap_pwd.3 +++ b/lib/libcasper/services/cap_pwd/cap_pwd.3 @@ -208,7 +208,7 @@ passwd = cap_getpwuid(cappwd, uid[0]); if (passwd == NULL) err(1, "Unable to get name of user"); -printf("UID %d is associated with name %s.\\n", uid[0], passwd->pw_name); +printf("UID %d is associated with name %s.\en", uid[0], passwd->pw_name); cap_close(cappwd); .Ed diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 index 2c7a491a1f8bd8..5d5730b39fba1e 100644 --- a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 +++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 @@ -173,7 +173,7 @@ size = sizeof(value); if (cap_sysctlbyname(capsysctl, name, &value, &size, NULL, 0) < 0) err(1, "Unable to get value of sysctl"); -printf("The value of %s is %d.\\n", name, value); +printf("The value of %s is %d.\en", name, value); cap_close(capsysctl); .Ed diff --git a/lib/libdpv/dpv.3 b/lib/libdpv/dpv.3 index bbc6de0bcfccfb..fe3771ea54eff4 100644 --- a/lib/libdpv/dpv.3 +++ b/lib/libdpv/dpv.3 @@ -493,7 +493,7 @@ Embed escaped newlines within prompt text to force line breaks. .Pp .Xr dialog 1 does not display the first character after a series of escaped escape-sequences -(for example, ``\\\\n'' produces ``\\'' instead of ``\\n''). +(for example, ``\e\en'' produces ``\e'' instead of ``\en''). This is a known issue with .Xr dialog 1 and does not affect @@ -522,7 +522,7 @@ This does not effect which renders the color escape sequences as plain text. See .Do -embedded "\\Z" sequences +embedded "\eZ" sequences .Dc in .Xr dialog 1 diff --git a/lib/libgssapi/gss_display_status.3 b/lib/libgssapi/gss_display_status.3 index 6e1f82f3824848..5ac8ca88929ff1 100644 --- a/lib/libgssapi/gss_display_status.3 +++ b/lib/libgssapi/gss_display_status.3 @@ -100,7 +100,7 @@ do { &status_string) fprintf(stderr, - "%.*s\\n", + "%.*s\en", (int)status_string.length, (char *)status_string.value); diff --git a/lib/libmixer/mixer.3 b/lib/libmixer/mixer.3 index 04aa3bd1dca7ce..ec378b1136a3ef 100644 --- a/lib/libmixer/mixer.3 +++ b/lib/libmixer/mixer.3 @@ -557,7 +557,7 @@ if ((m = mixer_open(mix_name)) == NULL) TAILQ_FOREACH(dp, &m->devs, devs) { if (M_ISRECSRC(m, dp->devno)) - printf("%s\\t%.2f:%.2f\\n", + printf("%s\et%.2f:%.2f\en", dp->name, dp->vol.left, dp->vol.right); } diff --git a/lib/libpam/modules/pam_login_access/pam_login_access.8 b/lib/libpam/modules/pam_login_access/pam_login_access.8 index f4009de3af724f..c775737b4a4bdc 100644 --- a/lib/libpam/modules/pam_login_access/pam_login_access.8 +++ b/lib/libpam/modules/pam_login_access/pam_login_access.8 @@ -90,7 +90,7 @@ changes the field separator from the default ":". More than one separator may be specified. .It Cm listsep Ns = Ns Ar separators -changes the field separator from the default space (''), tab (\\t) and +changes the field separator from the default space (''), tab (\et) and comma (,). More than one separator may be specified. For example, listsep=; diff --git a/lib/libstdbuf/libstdbuf.3 b/lib/libstdbuf/libstdbuf.3 index 4857f7096499de..805ae1c7952f2c 100644 --- a/lib/libstdbuf/libstdbuf.3 +++ b/lib/libstdbuf/libstdbuf.3 @@ -76,7 +76,7 @@ is used to force it to be line-buffered so .Xr vmstat 8 Ns 's output will not stall until the full buffer fills. .Bd -literal -offset indent -# vmstat 1 | LD_PRELOAD=/usr/lib/libstdbuf.so \\ +# vmstat 1 | LD_PRELOAD=/usr/lib/libstdbuf.so \e STDBUF_1=L awk '$2 > 1 || $3 > 1' | cat -n .Ed .Pp diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index b1e7211e4c1841..42da2b35c17957 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -341,7 +341,7 @@ and characters, which are substituted for a user's home directory and name respectively. To pass these characters literally into the environment variable, escape -the character by preceding it with a backslash '\\'. +the character by preceding it with a backslash '\e'. .Pp The .Em host.allow diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5 index 86158c9f02ff44..a8bb062bd901fd 100644 --- a/libexec/bootpd/bootptab.5 +++ b/libexec/bootpd/bootptab.5 @@ -376,7 +376,7 @@ Blank lines and lines beginning with "#" are ignored in the configuration file. Host entries are separated from one another by newlines; a single host entry may be extended over multiple lines if the lines end with a backslash -(\\). +(\e). It is also acceptable for lines to be longer than 80 characters. Tags may appear in any order, with the following exceptions: the hostname must be @@ -389,13 +389,13 @@ file follows: .Bd -literal -offset indent # Sample bootptab file (domain=andrew.cmu.edu) -\&.default:\\ - :hd=/usr/boot:bf=null:\\ - :ds=netserver, lancaster:\\ - :ns=pcs2, pcs1:\\ - :ts=pcs2, pcs1:\\ - :sm=255.255.255.0:\\ - :gw=gw.cs.cmu.edu:\\ +\&.default:\e + :hd=/usr/boot:bf=null:\e + :ds=netserver, lancaster:\e + :ns=pcs2, pcs1:\e + :ts=pcs2, pcs1:\e + :sm=255.255.255.0:\e + :gw=gw.cs.cmu.edu:\e :hn:to=-18000: carnegie:ht=6:ha=7FF8100000AF:tc=.default: @@ -406,9 +406,9 @@ bairdford:ht=1:ha=08002B02A2F9:tc=.default: bakerstown:ht=1:ha=08002B0287C8:tc=.default: # Special domain name server and option tags for next host -butlerjct:ha=08002001560D:ds=128.2.13.42:\\ - :T37=0x12345927AD3BCF:\\ - :T99="Special ASCII string":\\ +butlerjct:ha=08002001560D:ds=128.2.13.42:\e + :T37=0x12345927AD3BCF:\e + :T99="Special ASCII string":\e :tc=.default: gastonville:ht=6:ha=7FFF81000A47:tc=.default: diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8 index a0fde4c53b0bcc..abfca00c930133 100644 --- a/libexec/comsat/comsat.8 +++ b/libexec/comsat/comsat.8 @@ -77,7 +77,7 @@ the group execute bit turned on (by a .Dq Nm biff Cm b ) , two bell characters .Tn ( ASCII -\\007) are printed on the user's terminal. +\e007) are printed on the user's terminal. .Pp If .Ar mailbox-name diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 085d83cab7a25b..15a226f7d1846d 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -169,7 +169,7 @@ and read it from .Fx . .Bd -literal # Create a RAID-0 on Linux: -mdadm --create --chunk=32 --level=0 --raid-devices=2 /dev/md0 \\ +mdadm --create --chunk=32 --level=0 --raid-devices=2 /dev/md0 \e /dev/hda1 /dev/hdb1 # Make the RAID-0 just created available on FreeBSD: ccdconfig -c /dev/ccd0 32 linux /dev/ada0s1 /dev/ada0s2 diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index a57dfef7096d6b..1c6cd36437e127 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -347,7 +347,7 @@ on the vtnet0 interface, add the following to .Bd -literal case $reason in BOUND|REBIND|REBOOT|RENEW) - if [ "$interface" != vtnet0 ] || [ -n "$old_ip_address" -a \\ + if [ "$interface" != vtnet0 ] || [ -n "$old_ip_address" -a \e "$old_ip_address" = "$new_ip_address" ]; then break fi diff --git a/sbin/ipf/ipf/ipf.5 b/sbin/ipf/ipf/ipf.5 index 423e0de1b34ee0..8321e8d977fdc9 100644 --- a/sbin/ipf/ipf/ipf.5 +++ b/sbin/ipf/ipf/ipf.5 @@ -38,10 +38,10 @@ pass in on bgeo proto tcp from 1.1.1.1 port > 1000 to 2.2.2.2 port < 5000 flags S keep state .fi .PP -or explicitly using the backslash ('\\') character: +or explicitly using the backslash ('\e') character: .PP .nf -pass in on bgeo proto tcp from 1.1.1.1 port > 1000 \\ +pass in on bgeo proto tcp from 1.1.1.1 port > 1000 \e to 2.2.2.2 port < 5000 flags S keep state .fi .SS Comments @@ -313,7 +313,7 @@ of whether or not it is on the local host, return-icmp-as-dest is used like this: .PP .nf -block return-icmp-as-dest(port-unr) in proto udp \\ +block return-icmp-as-dest(port-unr) in proto udp \e from any to 192.168.1.0/24 .fi .SS TCP/UDP Port Matching @@ -717,9 +717,9 @@ been seen and the state no longer required. .RS .PP .nf -pass in quick proto icmp all icmp-type echo \\ +pass in quick proto icmp all icmp-type echo \e keep state (age 3) -pass in quick proto udp from any \\ +pass in quick proto udp from any \e to any port = 53 keep state (age 30/1) .fi .RE @@ -836,10 +836,10 @@ that match outbound packets, in-via is used to match the inbound packets. In each case, the syntax generalises to this: .PP .nf -pass ... in on forward-in,reverse-in \\ +pass ... in on forward-in,reverse-in \e out-via forward-out,reverse-out ... -pass ... out on forward-out,reverse-out \\ +pass ... out on forward-out,reverse-out \e in-via forward-in,reverse-in ... .fi .PP @@ -847,7 +847,7 @@ An example that pins down all 4 network interfaces used by an ssh connection might look something like this: .PP .nf -pass in on bge0,bge1 out-via bge1,bge0 proto tcp \\ +pass in on bge0,bge1 out-via bge1,bge0 proto tcp \e from any to any port = 22 flags S keep state .fi .SS Working with packet fragments @@ -966,7 +966,7 @@ transport mechanism. In this case, it is necessary to instruct IPFilter as to what protocol is inside UDP. .PP .nf -decapsulate l5-as(ip) in proto udp from any \\ +decapsulate l5-as(ip) in proto udp from any \e to any port = 1520 head 1001 .fi .PP @@ -997,7 +997,7 @@ interface:ip.address. It is expected that the address given as the next hop is directly connected to the network to which the interface is. .PP .nf -pass in on bge0 to bge1:1.1.1.1 proto tcp \\ +pass in on bge0 to bge1:1.1.1.1 proto tcp \e from 1.1.2.3 to any port = 80 flags S keep state .fi .PP @@ -1007,7 +1007,7 @@ in both directions because we now have a sense for what its reverse flow of packets is. .PP .nf -pass in on bge0 to bge1:1.1.1.1 reply-to hme1:2.1.1.2 \\ +pass in on bge0 to bge1:1.1.1.1 reply-to hme1:2.1.1.2 \e proto tcp from 1.1.2.3 to any port = 80 flags S keep state .fi .PP @@ -1029,8 +1029,8 @@ packet being created and sent out a different network. This can be useful for monitoring traffic and other purposes. .PP .nf -pass in on bge0 to bge1:1.1.1.1 reply-to hme1:2.1.1.2 \\ - dup-to fxp0:10.0.0.1 proto tcp from 1.1.2.3 \\ +pass in on bge0 to bge1:1.1.1.1 reply-to hme1:2.1.1.2 \e + dup-to fxp0:10.0.0.1 proto tcp from 1.1.2.3 \e to any port = 80 flags S keep state .fi .SS Matching IPv4 options @@ -1171,7 +1171,7 @@ is necessary to indicate to IPFilter that you only wish to log the first packet. .PP .nf -pass in log first quick proto tcp from any to any port = 22 \\ +pass in log first quick proto tcp from any to any port = 22 \e flags S keep state .fi .PP @@ -1185,7 +1185,7 @@ it is there until ipmon(8) reads it. .PP .nf block in log proto tcp from any to any port = smtp -pass in log or-block first quick proto tcp from any \\ +pass in log or-block first quick proto tcp from any \e to any port = 22 flags S keep state .fi .PP @@ -1204,7 +1204,7 @@ This can be tuned on a per rule basis like this: .PP .nf block in quick log level err all with bad -pass in log level local1.info proto tcp \\ +pass in log level local1.info proto tcp \e from any to any port = 22 flags S keep state .fi .PP @@ -1218,9 +1218,9 @@ the filter rule a comment. The comment is loaded with the rule into the kernel and can be seen when the rules are listed with ipfstat. .PP .nf -pass in quick proto tcp from any \\ +pass in quick proto tcp from any \e to port = 80 comment "all web server traffic is ok" -pass out quick proto tcp from any port = 80 \\ +pass out quick proto tcp from any port = 80 \e to any comment "all web server traffic is ok" .fi .SS Tags @@ -1260,7 +1260,7 @@ live. The time to live is specified in seconds. .PP .nf -pass in on fxp0 proto tcp from any \\ +pass in on fxp0 proto tcp from any \e to port = 22 flags S keep state rule-ttl 30 .fi .SH Internal packet attributes @@ -1654,7 +1654,7 @@ matching to be on arbitrary data in the packt. The use of a BPF expression replaces all of the other protocol header matching done by IPFilter. .PP .nf -pass in bpf-v4 { "tcp and (src port 23 or src port 50)" } \\ +pass in bpf-v4 { "tcp and (src port 23 or src port 50)" } \e keep state .fi .PP diff --git a/sbin/ipf/ipsend/ipsend.5 b/sbin/ipf/ipsend/ipsend.5 index 998957a030c95c..6444e5eea0bb32 100644 --- a/sbin/ipf/ipsend/ipsend.5 +++ b/sbin/ipf/ipsend/ipsend.5 @@ -313,8 +313,8 @@ bytes with any particular data). .B value indicates that the string provided should be added to the current packet as data. A string may be a consecutive list of characters and numbers (with -no white spaces) or bounded by "'s (may not contain them, even if \\'d). -The \\ character is recognised with the appropriate C escaped values, including +no white spaces) or bounded by "'s (may not contain them, even if \e'd). +The \e character is recognised with the appropriate C escaped values, including octal numbers. .TP .B file diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 715d8580f1cecc..0223dc297867c2 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1306,7 +1306,7 @@ operator as follows: .Pp Only one level of parentheses is allowed. Beware that most shells have special meanings for parentheses -or braces, so it is advisable to put a backslash \\ in front of them +or braces, so it is advisable to put a backslash \e in front of them to prevent such interpretations. .Pp The body of a rule must in general include a source and destination diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8 index 5469fef4ad35d3..af045970d5c37c 100644 --- a/sbin/mount_unionfs/mount_unionfs.8 +++ b/sbin/mount_unionfs/mount_unionfs.8 @@ -276,7 +276,7 @@ The commands .Bd -literal -offset indent mount -t cd9660 -o ro /dev/cd0 /usr/src chown 2020 /usr/src -mount -t unionfs -o noatime -o copymode=masquerade -o uid=builder \\ +mount -t unionfs -o noatime -o copymode=masquerade -o uid=builder \e -o udir=755 -o ufile=644 /var/obj /usr/src .Ed .Pp diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8 index 8cf12d7b60e148..c155379af50701 100644 --- a/sbin/routed/routed.8 +++ b/sbin/routed/routed.8 @@ -566,8 +566,8 @@ with specifies a RIPv2 cleartext password that will be included on all RIPv2 responses sent, and checked on all RIPv2 responses received. Any blanks, tab characters, commas, or '#', '|', or NULL characters in the -password must be escaped with a backslash (\\). -The common escape sequences \\n, \\r, \\t, \\b, and \\xxx have their +password must be escaped with a backslash (\e). +The common escape sequences \en, \er, \et, \eb, and \exxx have their usual meanings. The .Cm KeyID diff --git a/share/man/man3/CMSG_DATA.3 b/share/man/man3/CMSG_DATA.3 index 27e15613217eb3..03d053ab23a4ab 100644 --- a/share/man/man3/CMSG_DATA.3 +++ b/share/man/man3/CMSG_DATA.3 @@ -140,7 +140,7 @@ main() cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { hellofd[1] = *(int *)CMSG_DATA(cmsg); - printf("child: sending '%s'\\n", buf); + printf("child: sending '%s'\en", buf); if (write(hellofd[1], buf, HELLOLEN) == -1) err(EX_IOERR, "failed to send 'hello'"); } @@ -164,7 +164,7 @@ main() if (read(hellofd[0], buf, HELLOLEN) == -1) err(EX_IOERR, "failed to receive 'hello'"); - printf("parent: received '%s'\\n", buf); + printf("parent: received '%s'\en", buf); break; } diff --git a/share/man/man3/Q_INI.3 b/share/man/man3/Q_INI.3 index b7794d729f4811..0bc3a66f8b9e43 100644 --- a/share/man/man3/Q_INI.3 +++ b/share/man/man3/Q_INI.3 @@ -164,7 +164,7 @@ Specifying as -1 renders the number's fractional component with maximum precision. If .Fa slen -is greater than zero but insufficient to hold the complete C-string, the '\\0' +is greater than zero but insufficient to hold the complete C-string, the '\e0' C-string terminator will be written to .Fa *s , thereby returning a zero length C-string. @@ -231,7 +231,7 @@ returns the initialised Q number which can be used to chain initialise additional Q numbers. .Pp .Fn Q_TOSTR -returns a pointer to the '\\0' C-string terminator appended to +returns a pointer to the '\e0' C-string terminator appended to .Fa s after the rendered numeric data, or NULL on buffer overflow. .Pp diff --git a/share/man/man3/qmath.3 b/share/man/man3/qmath.3 index 5c2332f0bc5520..ad3d723a4c61fb 100644 --- a/share/man/man3/qmath.3 +++ b/share/man/man3/qmath.3 @@ -325,7 +325,7 @@ Q_QMULQ(&a, r); Q_QMULQ(&a, pi); Q_TOSTR(a, -1, 10, buf, sizeof(buf)); -printf("%s\\n", buf); +printf("%s\en", buf); .Ed .Ss Debugging Declare a Q20.8 s32q_t number @@ -340,16 +340,16 @@ Q_INI(&s32, 0, 0, 8); Q_QFRACI(&s32, 5, 3); char buf[Q_MAXSTRLEN(s32, 10)]; Q_TOSTR(s32, -1, 10, buf, sizeof(buf)); -printf(Q_DEBUG(s32, "", "\\n\\ttostr=%s\\n\\n", 0), buf); +printf(Q_DEBUG(s32, "", "\en\ettostr=%s\en\en", 0), buf); .Ed .Pp The above code outputs the following to the console: .Bd -literal -offset indent "s32"@0x7fffffffe7d4 - type=s32q_t, Qm.n=Q20.8, rpshft=11, imin=0xfff00001, \\ + type=s32q_t, Qm.n=Q20.8, rpshft=11, imin=0xfff00001, \e imax=0xfffff qraw=0x00000d53 - imask=0x7ffff800, fmask=0x000007f8, cmask=0x00000007, \\ + imask=0x7ffff800, fmask=0x000007f8, cmask=0x00000007, \e ifmask=0x7ffffff8 iraw=0x00000800, iabsval=0x1, ival=0x1 fraw=0x00000550, fabsval=0xaa, fval=0xaa