diff options
author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-02-16 16:38:55 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-02-16 16:38:55 +0000 |
commit | 019062b67a14498a839a7f58e3e283447bc2657f (patch) | |
tree | c91bdd4279d3f2e9ce2011c9063cf5f8e72f8a0f /share/man/man4 | |
parent | be81257f1e5b86a0cafa3dc2c9293b19235abe06 (diff) |
Replace \*(Lt \*(Le \*(Gt \*(Ge with literal < <= > >= respectively,
except for instances where \*(Le and \*(Ge are clearly understood as
mathematical symbols. Discussed with schwarze@
Diffstat (limited to 'share/man/man4')
-rw-r--r-- | share/man/man4/ddb.4 | 8 | ||||
-rw-r--r-- | share/man/man4/enc.4 | 12 | ||||
-rw-r--r-- | share/man/man4/ipsec.4 | 10 | ||||
-rw-r--r-- | share/man/man4/multicast.4 | 76 | ||||
-rw-r--r-- | share/man/man4/pppoe.4 | 8 | ||||
-rw-r--r-- | share/man/man4/softraid.4 | 6 | ||||
-rw-r--r-- | share/man/man4/ugen.4 | 8 |
7 files changed, 64 insertions, 64 deletions
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 00250fecb43..1dd1163d27b 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ddb.4,v 1.76 2014/03/18 22:36:31 miod Exp $ +.\" $OpenBSD: ddb.4,v 1.77 2015/02/16 16:38:54 naddy Exp $ .\" $NetBSD: ddb.4,v 1.5 1994/11/30 16:22:09 jtc Exp $ .\" .\" Mach Operating System @@ -25,7 +25,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd $Mdocdate: March 18 2014 $ +.Dd $Mdocdate: February 16 2015 $ .Dt DDB 4 .Os .Sh NAME @@ -70,7 +70,7 @@ is set to 2. .Nm prompts for commands on the console with: .Pp -.Dl ddb\*(Gt +.Dl ddb> .Pp The general syntax of a .Nm @@ -192,7 +192,7 @@ exchange the two characters to the left of the cursor .El .Sh COMMANDS The following commands may be typed at the -.Ql ddb\*(Gt +.Ql ddb> prompt. Some commands consist of more than one word, and if only the first word or words are entered, the possible alternatives to complete the command diff --git a/share/man/man4/enc.4 b/share/man/man4/enc.4 index 231585e1553..3c3709b9ff1 100644 --- a/share/man/man4/enc.4 +++ b/share/man/man4/enc.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: enc.4,v 1.28 2010/06/29 21:28:37 reyk Exp $ +.\" $OpenBSD: enc.4,v 1.29 2015/02/16 16:38:54 naddy Exp $ .\" .\" Copyright (c) 2006 Jason McIntyre <jmc@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 29 2010 $ +.Dd $Mdocdate: February 16 2015 $ .Dt ENC 4 .Os .Sh NAME @@ -111,11 +111,11 @@ For example: tcpdump: WARNING: enc0: no IPv4 address assigned tcpdump: listening on enc0, link-type ENC 15:05:08.934708 (authentic,confidential): SPI 0x6bcac587: \e - 172.25.0.45 \*(Gt 1.2.3.4: 10.9.9.28.7001 \*(Gt 10.0.0.33.7000: \e + 172.25.0.45 > 1.2.3.4: 10.9.9.28.7001 > 10.0.0.33.7000: \e [udp sum ok] udp 52 (ttl 64, id 5672, len 80) \e (ttl 64, id 30009, len 100, bad cksum 0!) 15:05:09.063517 (authentic,confidential): SPI 0x4b70c05a: \e - 1.2.3.4 \*(Gt 172.25.0.45: 10.0.0.33.7000 \*(Gt 10.9.9.28.7001: \e + 1.2.3.4 > 172.25.0.45: 10.0.0.33.7000 > 10.9.9.28.7001: \e [udp sum ok] udp 156 (ttl 63, id 14880, len 184) \e (ttl 51, id 19689, len 204) .Ed @@ -130,7 +130,7 @@ Negotiations can be watched on the physical interface too: # tcpdump -envps 1500 -i wi0 port 500 or port 4500 tcpdump: listening on wi0, link-type EN10MB 15:15:58.188747 0:2:6f:3a:3f:3e 0:10:f3:3:bd:8a 0800 226: \e - 172.25.0.45.500 \*(Gt 1.2.3.4.500: [udp sum ok] \e + 172.25.0.45.500 > 1.2.3.4.500: [udp sum ok] \e [...] attribute ENCRYPTION_ALGORITHM = AES_CBC attribute HASH_ALGORITHM = SHA @@ -141,7 +141,7 @@ tcpdump: listening on wi0, link-type EN10MB attribute KEY_LENGTH = 128 [...] 15:15:59.080058 0:10:f3:3:bd:8a 0:2:6f:3a:3f:3e 0800 226: \e - 1.2.3.4.500 \*(Gt 172.25.0.45.500: [udp sum ok] \e + 1.2.3.4.500 > 172.25.0.45.500: [udp sum ok] \e [...] attribute ENCRYPTION_ALGORITHM = AES_CBC attribute HASH_ALGORITHM = SHA diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4 index 1f73fa9be53..1a71ae3a1ec 100644 --- a/share/man/man4/ipsec.4 +++ b/share/man/man4/ipsec.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipsec.4,v 1.82 2015/01/29 07:48:51 jmc Exp $ +.\" $OpenBSD: ipsec.4,v 1.83 2015/02/16 16:38:54 naddy Exp $ .\" .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> .\" All rights reserved. @@ -30,7 +30,7 @@ .\" .\" Manual page, using -mandoc macros .\" -.Dd $Mdocdate: January 29 2015 $ +.Dd $Mdocdate: February 16 2015 $ .Dt IPSEC 4 .Os .Sh NAME @@ -216,7 +216,7 @@ where two firewalls use IPsec to secure the traffic of all the hosts behind them. For example: .Bd -literal -offset indent -Net A \*(Lt----\*(Gt Firewall 1 \*(Lt--- Internet ---\*(Gt Firewall 2 \*(Lt----\*(Gt Net B +Net A <----> Firewall 1 <--- Internet ---> Firewall 2 <----> Net B .Ed .Pp Firewall 1 and Firewall 2 can protect all communications between Net A @@ -233,8 +233,8 @@ interfaces, but special care should be taken because of the interactions between NAT and the IPsec flow matching, especially on the packet output path. Inside the TCP/IP stack, packets go through the following stages: .Bd -literal -offset indent -UL/R -\*(Gt [X] -\*(Gt PF/NAT(enc0) -\*(Gt IPsec -\*(Gt PF/NAT(IF) -\*(Gt IF -UL/R \*(Lt-------- PF/NAT(enc0) \*(Lt- IPsec \*(Lt- PF/NAT(IF) \*(Lt- IF +UL/R -> [X] -> PF/NAT(enc0) -> IPsec -> PF/NAT(IF) -> IF +UL/R <-------- PF/NAT(enc0) <- IPsec <- PF/NAT(IF) <- IF .Ed .Pp With IF being the real interface and UL/R the Upper Layer or Routing code. diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4 index 1ec3ce0834c..0f7e7112974 100644 --- a/share/man/man4/multicast.4 +++ b/share/man/man4/multicast.4 @@ -24,10 +24,10 @@ .\" DEALINGS IN THE SOFTWARE. .\" .\" $FreeBSD: src/share/man/man4/multicast.4,v 1.4 2004/07/09 09:22:36 ru Exp $ -.\" $OpenBSD: multicast.4,v 1.9 2014/01/21 03:15:46 schwarze Exp $ +.\" $OpenBSD: multicast.4,v 1.10 2015/02/16 16:38:54 naddy Exp $ .\" $NetBSD: multicast.4,v 1.3 2004/09/12 13:12:26 wiz Exp $ .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: February 16 2015 $ .Dt MULTICAST 4 .Os .\" @@ -303,7 +303,7 @@ memset(&mc, 0, sizeof(mc)); memcpy(&mc.mfcc_origin, &source_addr, sizeof(mc.mfcc_origin)); memcpy(&mc.mfcc_mcastgrp, &group_addr, sizeof(mc.mfcc_mcastgrp)); mc.mfcc_parent = iif_index; -for (i = 0; i \*(Lt maxvifs; i++) +for (i = 0; i < maxvifs; i++) mc.mfcc_ttls[i] = oifs_ttl[i]; setsockopt(mrouter_s4, IPPROTO_IP, MRT_ADD_MFC, (void *)&mc, sizeof(mc)); @@ -315,8 +315,8 @@ memset(&mc, 0, sizeof(mc)); memcpy(&mc.mf6cc_origin, &source_addr, sizeof(mc.mf6cc_origin)); memcpy(&mc.mf6cc_mcastgrp, &group_addr, sizeof(mf6cc_mcastgrp)); mc.mf6cc_parent = iif_index; -for (i = 0; i \*(Lt maxvifs; i++) - if (oifs_ttl[i] \*(Gt 0) +for (i = 0; i < maxvifs; i++) + if (oifs_ttl[i] > 0) IF_SET(i, &mc.mf6cc_ifset); setsockopt(mrouter_s4, IPPROTO_IPV6, MRT6_ADD_MFC, (void *)&mc, sizeof(mc)); @@ -513,15 +513,15 @@ should be called right after .Pp Currently, the following set of new features is defined: .Bd -literal -#define MRT_MFC_FLAGS_DISABLE_WRONGVIF (1 \*(Lt\*(Lt 0)/*disable WRONGVIF signals*/ -#define MRT_MFC_FLAGS_BORDER_VIF (1 \*(Lt\*(Lt 1) /* border vif */ -#define MRT_MFC_RP (1 \*(Lt\*(Lt 8) /* enable RP address */ -#define MRT_MFC_BW_UPCALL (1 \*(Lt\*(Lt 9) /* enable bw upcalls */ +#define MRT_MFC_FLAGS_DISABLE_WRONGVIF (1 << 0)/*disable WRONGVIF signals*/ +#define MRT_MFC_FLAGS_BORDER_VIF (1 << 1) /* border vif */ +#define MRT_MFC_RP (1 << 8) /* enable RP address */ +#define MRT_MFC_BW_UPCALL (1 << 9) /* enable bw upcalls */ .Ed .\" .Pp .\" In the future there might be: .\" .Bd -literal -.\" #define MRT_MFC_GROUP_SPECIFIC (1 \*(Lt\*(Lt 10) /* allow (*,G) MFC entries */ +.\" #define MRT_MFC_GROUP_SPECIFIC (1 << 10) /* allow (*,G) MFC entries */ .\" .Ed .\" .Pp .\" to allow (*,G) MFC entries (i.e., group-specific entries) in the kernel. @@ -572,8 +572,8 @@ field is used to set various flags per interface per (S,G) entry. Currently, the defined flags are: .Bd -literal -#define MRT_MFC_FLAGS_DISABLE_WRONGVIF (1 \*(Lt\*(Lt 0)/*disable WRONGVIF signals*/ -#define MRT_MFC_FLAGS_BORDER_VIF (1 \*(Lt\*(Lt 1) /* border vif */ +#define MRT_MFC_FLAGS_DISABLE_WRONGVIF (1 << 0)/*disable WRONGVIF signals*/ +#define MRT_MFC_FLAGS_BORDER_VIF (1 << 1) /* border vif */ .Ed .Pp The @@ -699,14 +699,14 @@ There can be more than one filter per (S,G). .It Instead of supporting all possible comparison operations -(i.e., \*(Lt \*(Lt= == != \*(Gt \*(Gt= ), there is support only for the -\*(Lt= and \*(Gt= operations, +(i.e., < <= == != > >= ), there is support only for the +<= and >= operations, because this makes the kernel-level implementation simpler, and because practically we need only those two. Furthermore, the missing operations can be simulated by secondary -user-level filtering of those \*(Lt= and \*(Gt= filters. +user-level filtering of those <= and >= filters. For example, to simulate !=, then we need to install filter -.Dq bw \*(Lt= 0xffffffff , +.Dq bw <= 0xffffffff , and after an upcall is received, we need to check whether .Dq measured_bw != expected_bw . @@ -746,14 +746,14 @@ the following: * * Measurement works as follows: * - * For \*(Gt= measurements: + * For >= measurements: * The first packet marks the start of a measurement interval. * During an interval we count packets and bytes, and when we * pass the threshold we deliver an upcall and we are done. * The first packet after the end of the interval resets the * count and restarts the measurement. * - * For \*(Lt= measurement: + * For <= measurement: * We start a timer to fire at the end of the interval, and * then for each incoming packet we count packets and bytes. * When the timer fires, we compare the value with the threshold, @@ -771,11 +771,11 @@ struct bw_upcall { struct in_addr bu_src; /* source address */ struct in_addr bu_dst; /* destination address */ uint32_t bu_flags; /* misc flags (see below) */ -#define BW_UPCALL_UNIT_PACKETS (1 \*(Lt\*(Lt 0) /* threshold (in packets) */ -#define BW_UPCALL_UNIT_BYTES (1 \*(Lt\*(Lt 1) /* threshold (in bytes) */ -#define BW_UPCALL_GEQ (1 \*(Lt\*(Lt 2) /* upcall if bw \*(Gt= threshold */ -#define BW_UPCALL_LEQ (1 \*(Lt\*(Lt 3) /* upcall if bw \*(Lt= threshold */ -#define BW_UPCALL_DELETE_ALL (1 \*(Lt\*(Lt 4) /* delete all upcalls for s,d*/ +#define BW_UPCALL_UNIT_PACKETS (1 << 0) /* threshold (in packets) */ +#define BW_UPCALL_UNIT_BYTES (1 << 1) /* threshold (in bytes) */ +#define BW_UPCALL_GEQ (1 << 2) /* upcall if bw >= threshold */ +#define BW_UPCALL_LEQ (1 << 3) /* upcall if bw <= threshold */ +#define BW_UPCALL_DELETE_ALL (1 << 4) /* delete all upcalls for s,d*/ struct bw_data bu_threshold; /* the bw threshold */ struct bw_data bu_measured; /* the measured bw */ }; @@ -802,19 +802,19 @@ argument, and that filter will trigger an upcall according to the following pseudo-algorithm: .Bd -literal - if (bw_upcall_oper IS "\*(Gt=") { + if (bw_upcall_oper IS ">=") { if (((bw_upcall_unit & PACKETS == PACKETS) && - (measured_packets \*(Gt= threshold_packets)) || + (measured_packets >= threshold_packets)) || ((bw_upcall_unit & BYTES == BYTES) && - (measured_bytes \*(Gt= threshold_bytes))) - SEND_UPCALL("measured bandwidth is \*(Gt= threshold"); + (measured_bytes >= threshold_bytes))) + SEND_UPCALL("measured bandwidth is >= threshold"); } - if (bw_upcall_oper IS "\*(Lt=" && measured_interval \*(Gt= threshold_interval) { + if (bw_upcall_oper IS "<=" && measured_interval >= threshold_interval) { if (((bw_upcall_unit & PACKETS == PACKETS) && - (measured_packets \*(Lt= threshold_packets)) || + (measured_packets <= threshold_packets)) || ((bw_upcall_unit & BYTES == BYTES) && - (measured_bytes \*(Lt= threshold_bytes))) - SEND_UPCALL("measured bandwidth is \*(Lt= threshold"); + (measured_bytes <= threshold_bytes))) + SEND_UPCALL("measured bandwidth is <= threshold"); } .Ed .Pp @@ -823,18 +823,18 @@ In the same the unit can be specified in both BYTES and PACKETS. However, the GEQ and LEQ flags are mutually exclusive. .Pp -Basically, an upcall is delivered if the measured bandwidth is \*(Gt= or -\*(Lt= the threshold bandwidth (within the specified measurement +Basically, an upcall is delivered if the measured bandwidth is >= or +<= the threshold bandwidth (within the specified measurement interval). For practical reasons, the smallest value for the measurement interval is 3 seconds. If smaller values are allowed, then the bandwidth estimation may be less accurate, or the potentially very high frequency of the generated upcalls may introduce too much overhead. -For the \*(Gt= operation, the answer may be known before the end of +For the >= operation, the answer may be known before the end of .Va threshold_interval , therefore the upcall may be delivered earlier. -For the \*(Lt= operation however, we must wait +For the <= operation however, we must wait until the threshold interval has expired to know the answer. .Sh EXAMPLES .Bd -literal -offset indent @@ -910,10 +910,10 @@ the particular intervals are measured, the user should be careful how is used. For example, if the filter is installed to trigger an upcall if the number of packets -is \*(Gt= 1, then +is >= 1, then .Va bu_measured may have a value of zero in the upcalls after the -first one, because the measured interval for \*(Gt= filters is +first one, because the measured interval for >= filters is .Dq clocked by the forwarded packets. Hence, this upcall mechanism should not be used for measuring @@ -930,7 +930,7 @@ Note that the upcalls for a filter are delivered until the specific filter is deleted, but no more frequently than once per .Va bu_threshold.b_time . For example, if the filter is specified to -deliver a signal if bw \*(Gt= 1 packet, the first packet will trigger a +deliver a signal if bw >= 1 packet, the first packet will trigger a signal, but the next upcall will be triggered no earlier than .Va bu_threshold.b_time after the previous upcall. diff --git a/share/man/man4/pppoe.4 b/share/man/man4/pppoe.4 index 387de882dd4..29158d4516f 100644 --- a/share/man/man4/pppoe.4 +++ b/share/man/man4/pppoe.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pppoe.4,v 1.27 2014/10/08 12:57:51 sthen Exp $ +.\" $OpenBSD: pppoe.4,v 1.28 2015/02/16 16:38:54 naddy Exp $ .\" $NetBSD: pppoe.4,v 1.26 2003/10/02 07:06:36 wiz Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 8 2014 $ +.Dd $Mdocdate: February 16 2015 $ .Dt PPPOE 4 .Os .Sh NAME @@ -108,7 +108,7 @@ dest 0.0.0.1 The physical interface must also be marked .Ql up : .Bd -literal -offset indent -# echo "up" \*(Gt /etc/hostname.em0 +# echo "up" > /etc/hostname.em0 .Ed .Pp Since this is a PPP interface, the addresses assigned to the interface @@ -216,7 +216,7 @@ dest 0.0.0.1 .Pp The physical interface must also be configured like so: .Bd -literal -offset indent -# echo "up mtu 1508" \*(Gt /etc/hostname.em0 +# echo "up mtu 1508" > /etc/hostname.em0 .Ed .Pp With this, the previously mentioned MSS clamping rules in diff --git a/share/man/man4/softraid.4 b/share/man/man4/softraid.4 index 85f5f07a98f..9979102009f 100644 --- a/share/man/man4/softraid.4 +++ b/share/man/man4/softraid.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: softraid.4,v 1.38 2014/11/27 13:15:54 stsp Exp $ +.\" $OpenBSD: softraid.4,v 1.39 2015/02/16 16:38:54 naddy Exp $ .\" .\" Copyright (c) 2007 Todd T. Fries <todd@OpenBSD.org> .\" Copyright (c) 2007 Marco Peereboom <marco@OpenBSD.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 27 2014 $ +.Dd $Mdocdate: February 16 2015 $ .Dt SOFTRAID 4 .Os .Sh NAME @@ -141,7 +141,7 @@ Assemble the RAID volume: The console will show what device was added to the system: .Bd -literal -offset indent scsibus0 at softraid0: 1 targets -sd0 at scsibus0 targ 0 lun 0: \*(LtOPENBSD, SR RAID 1, 001\*(Gt SCSI2 +sd0 at scsibus0 targ 0 lun 0: <OPENBSD, SR RAID 1, 001> SCSI2 sd0: 1MB, 0 cyl, 255 head, 63 sec, 512 bytes/sec, 3714 sec total .Ed .Pp diff --git a/share/man/man4/ugen.4 b/share/man/man4/ugen.4 index b83100ad21f..d8beefd5719 100644 --- a/share/man/man4/ugen.4 +++ b/share/man/man4/ugen.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ugen.4,v 1.15 2008/06/26 05:42:07 ray Exp $ +.\" $OpenBSD: ugen.4,v 1.16 2015/02/16 16:38:54 naddy Exp $ .\" $NetBSD: ugen.4,v 1.7 1999/07/30 01:32:05 augustss Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: February 16 2015 $ .Dt UGEN 4 .Os .Sh NAME @@ -270,11 +270,11 @@ All endpoints (except the control endpoint) for the current configuration can be found by iterating the .Fa interface_index from 0 to -.Fa config_desc-\*(GtbNumInterface-1 +.Fa config_desc->bNumInterface-1 and for each of these iterating the .Fa endpoint_index from 0 to -.Fa interface_desc-\*(GtbNumEndpoints-1 . +.Fa interface_desc->bNumEndpoints-1 . The .Fa config_index should be set to |