From d3367c5f5d3ddcc6824d8f41c4cf179f9a5588f8 Mon Sep 17 00:00:00 2001 From: schweikh Date: Wed, 1 Jan 2003 18:49:04 +0000 Subject: Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup, especially in troff files. --- share/doc/IPv6/IMPLEMENTATION | 2 +- share/doc/papers/diskperf/motivation.ms | 4 ++- share/doc/papers/diskperf/tests.ms | 6 ++--- share/doc/papers/sysperf/4.t | 38 +++++++++++++++------------- share/doc/psd/21.ipc/3.t | 4 ++- share/doc/smm/01.setup/3.t | 28 ++++++++++----------- share/doc/smm/05.fastfs/3.t | 42 ++++++++++++++++--------------- share/doc/smm/06.nfs/1.t | 2 +- share/doc/smm/06.nfs/2.t | 6 +++-- share/doc/smm/18.net/7.t | 4 ++- share/doc/usd/18.msdiffs/ms.diffs | 4 ++- share/doc/usd/21.troff/m1 | 22 ++++++++-------- share/doc/usd/21.troff/m2 | 16 ++++++------ share/doc/usd/22.trofftut/tt04 | 18 ++++++------- share/examples/ipfilter/examples.txt | 2 +- share/examples/ipfilter/ipf-howto.txt | 2 +- share/examples/isdn/FAQ | 10 ++++---- share/examples/isdn/Overview | 10 ++++---- share/examples/isdn/i4brunppp/README | 5 ++-- share/examples/isdn/i4brunppp/i4brunppp.c | 42 +++++++++++++++---------------- share/examples/ppp/ppp.conf.sample | 30 +++++++++++----------- share/man/man4/keyboard.4 | 2 +- share/man/man4/polling.4 | 2 +- 23 files changed, 157 insertions(+), 144 deletions(-) (limited to 'share') diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION index ea1715f..1b663dc 100644 --- a/share/doc/IPv6/IMPLEMENTATION +++ b/share/doc/IPv6/IMPLEMENTATION @@ -187,7 +187,7 @@ even if instructed not to do so (especially in promiscuous mode). In such cases DAD may fail, because DAD engine sees inbound NS packet (actually from the node itself) and considers it as a sign of duplicate. In this case, drivers should be corrected to honor IFF_SIMPLEX behavior. -For example, you may need to check source MAC address on a inbound packet, +For example, you may need to check source MAC address on an inbound packet, and reject it if it is from the node itself. You may also want to look at #if condition marked "heuristics" in sys/netinet6/nd6_nbr.c:nd6_dad_timer() as workaround (note that the code diff --git a/share/doc/papers/diskperf/motivation.ms b/share/doc/papers/diskperf/motivation.ms index 2884fc5..d5fde9d 100644 --- a/share/doc/papers/diskperf/motivation.ms +++ b/share/doc/papers/diskperf/motivation.ms @@ -31,6 +31,8 @@ .\" .\" @(#)motivation.ms 6.2 (Berkeley) 4/16/91 .\" +.\" $FreeBSD$ +.\" .ds RH Motivation .NH Motivation @@ -45,7 +47,7 @@ DEC has become, with the introduction of the UDA50/RA81 system, cost competitive in the area of disk storage for the first time. Emulex's entry into the VAX 11/780 SBI controller -field, the SC780, represented a important choice for us to examine, given +field, the SC780, represented an important choice for us to examine, given our previous success with their VAX 11/750 SC750 controller and their UNIBUS controllers. The Fujitsu 2351A diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms index 40bbe0f..e937931 100644 --- a/share/doc/papers/diskperf/tests.ms +++ b/share/doc/papers/diskperf/tests.ms @@ -71,7 +71,7 @@ This is typical of most 4.2BSD user programs since a standard set of I/O support routines is commonly used and these routines buffer data in similar block sizes. .PP -For each test run, a empty eight Kilobyte block +For each test run, an empty eight Kilobyte block file system was created in the target storage system. Then each of the four tests was run and timed. @@ -79,9 +79,9 @@ Each test was run three times; the first to clear out any useful data in the cache, and the second two to insure that the experiment had stablized and was repeatable. -Each test operated on eight Megabytes of data to +Each test operated on eight Megabytes of data to insure that the cache did not overly influence the results. -Another file system was then initialized using a +Another file system was then initialized using a basic blocking factor of four Kilobytes and the same tests were run again and timed. A command script for a run appears as follows: diff --git a/share/doc/papers/sysperf/4.t b/share/doc/papers/sysperf/4.t index cf52502..373a0d0 100644 --- a/share/doc/papers/sysperf/4.t +++ b/share/doc/papers/sysperf/4.t @@ -31,11 +31,13 @@ .\" .\" @(#)4.t 5.1 (Berkeley) 4/17/91 .\" +.\" $FreeBSD$ +.\" .ds RH Performance Improvements .NH Performance Improvements .PP -This section outlines the changes made to the system +This section outlines the changes made to the system since the 4.2BSD distribution. The changes reported here were made in response to the problems described in Section 3. @@ -79,7 +81,7 @@ The inner loop performs a linear search through a directory looking for a particular pathname component. .PP Our first idea was to reduce the number of iterations -around the inner loop of \fInamei\fP by observing that many programs +around the inner loop of \fInamei\fP by observing that many programs step through a directory performing an operation on each entry in turn. To improve performance for processes doing directory scans, the system keeps track of the directory offset of the last component of the @@ -99,7 +101,7 @@ delim off .EN .PP The cost of the cache is about 20 lines of code -(about 0.2 kilobytes) +(about 0.2 kilobytes) and 16 bytes per process, with the cached data stored in a process's \fIuser\fP vector. .PP @@ -162,7 +164,7 @@ For each path name component, for the needed name. If it exists, the directory search can be completely eliminated. .PP -The system already maintained a cache of recently accessed inodes, +The system already maintained a cache of recently accessed inodes, so the initial name cache maintained a simple name-inode association that was used to check each component of a path name during name translations. @@ -172,7 +174,7 @@ but eventually decided to have a separate data structure that kept names with pointers to the inode table. Tagging inodes has two drawbacks; many inodes such as those associated with login ports remain in -the inode table for a long period of time, but are never looked +the inode table for a long period of time, but are never looked up by name. Other inodes, such as those describing directories are looked up frequently by many different names (\fIe.g.\fP ``..''). @@ -183,7 +185,7 @@ of the inode table, so that machines with small amounts of memory can reduce the size of the cache (or even eliminate it) without modifying the inode table structure. .PP -Another issue to be considered is how the name cache should +Another issue to be considered is how the name cache should hold references to the inode table. Normally processes hold ``hard references'' by incrementing the reference count in the inode they reference. @@ -219,7 +221,7 @@ searching through the entire cache; instead all you need to do is assign a new capability to the inode. .PP The cost of the name cache is about 200 lines of code -(about 1.2 kilobytes) +(about 1.2 kilobytes) and 48 bytes per cache entry. Depending on the size of the system, about 200 to 1000 entries will normally be configured, @@ -304,7 +306,7 @@ it is impossible to statically select the most efficient input mode to use. .PP We therefore changed the terminal multiplexor handlers to dynamically choose between the use of the silo and the use of -per-character interrupts. +per-character interrupts. At low input rates the handler processes characters on an interrupt basis, avoiding the overhead of checking each interface on each clock interrupt. @@ -389,7 +391,7 @@ As most of the clock-based events need not be done at high priority, the system schedules a lower priority software interrupt to do the less time-critical events such as cpu scheduling and timeout processing. Often there are no such events, and the software interrupt handler -finds nothing to do and returns. +finds nothing to do and returns. The high priority event now checks to see if there are low priority events to process; if there is nothing to do, the software interrupt is not requested. @@ -533,7 +535,7 @@ run over the assembly language and replace calls to small routines with the code for the body of the routine, often a single VAX instruction. While this optimization eliminated the cost of the subroutine -call and return, +call and return, it did not eliminate the pushing and popping of several arguments to the routine. The \fIsed\fP script has been replaced by a more intelligent expander, @@ -587,7 +589,7 @@ dramatically improved simply by enlarging the size of the hash table. .NH 2 Improvements to Libraries and Utilities .PP -Intuitively, changes to the kernel would seem to have the greatest +Intuitively, changes to the kernel would seem to have the greatest payoff since they affect all programs that run on the system. However, the kernel has been tuned many times before, so the opportunity for significant improvement was small. @@ -661,7 +663,7 @@ on the entire mail system. The first problem identified was a bug in the \fIsyslog\fP program. The mail delivery program, \fIsendmail\fP logs all mail transactions through this process with the 4.2BSD interprocess communication facilities. \fISyslog\fP then records the information in -a log file. Unfortunately, \fIsyslog\fP was performing a \fIsync\fP +a log file. Unfortunately, \fIsyslog\fP was performing a \fIsync\fP operation after each message it received, whether it was logged to a file or not. This wreaked havoc on the effectiveness of the buffer cache and explained, to a large @@ -670,22 +672,22 @@ heavy load on the system (one syslog message was generated for each message recipient causing almost a continuous sequence of sync operations). .PP The hashed data base files were -installed in all mail programs, resulting in a order of magnitude +installed in all mail programs, resulting in an order of magnitude speedup on large distribution lists. The code in \fI/bin/mail\fP that notifies the \fIcomsat\fP program when mail has been delivered to a user was changed to cache host table lookups, resulting in a similar -speedup on large distribution lists. +speedup on large distribution lists. .PP Next, the file locking facilities provided in 4.2BSD, \fIflock\fP\|(2), were used in place of the old -locking mechanism. +locking mechanism. The mail system previously used \fIlink\fP and \fIunlink\fP in -implementing file locking primitives. +implementing file locking primitives. Because these operations usually modify the contents of directories they require synchronous disk operations and cannot take advantage of the name cache maintained by the system. Unlink requires that the entry be found in the directory so that -it can be removed; +it can be removed; link requires that the directory be scanned to insure that the name does not already exist. By contrast the advisory locking facility in 4.2BSD is @@ -698,7 +700,7 @@ compiling it without debugging code reduced the overhead by another 20%. Network Servers .PP With the introduction of the network facilities in 4.2BSD, -a myriad of services became available, each of which +a myriad of services became available, each of which required its own daemon process. Many of these daemons were rarely if ever used, yet they lay asleep in the process table consuming diff --git a/share/doc/psd/21.ipc/3.t b/share/doc/psd/21.ipc/3.t index 0d429cf..62e8c37 100644 --- a/share/doc/psd/21.ipc/3.t +++ b/share/doc/psd/21.ipc/3.t @@ -31,6 +31,8 @@ .\" .\" @(#)3.t 8.1 (Berkeley) 6/8/93 .\" +.\" $FreeBSD$ +.\" .\".ds RH "Network Library Routines .bp .nr H1 3 @@ -245,7 +247,7 @@ struct protoent { .DE .PP In the NS domain, protocols are indicated by the "client type" -field of a IDP header. No protocol database exists; see section +field of an IDP header. No protocol database exists; see section 5 for more information. .NH 2 Service names diff --git a/share/doc/smm/01.setup/3.t b/share/doc/smm/01.setup/3.t index 54531ad..0f3e859 100644 --- a/share/doc/smm/01.setup/3.t +++ b/share/doc/smm/01.setup/3.t @@ -380,7 +380,7 @@ the kernel will use .Pn \*(Dk1a as its root filesystem. If .Pn /dev/\*(Dk1b -is configured as a swap partition, +is configured as a swap partition, it will be used as the initial swap area, otherwise the normal primary swap area (\c .Pn /dev/\*(Dk0b ) @@ -489,7 +489,7 @@ tape, extract them into a scratch directory, say .PP The data files marked in the previous table with a dagger (\(dg) may be used without change from the previous system. -Those data files marked with a double dagger (\(dd) have syntax +Those data files marked with a double dagger (\(dd) have syntax changes or substantial enhancements. You should start with the \*(4B version and carefully integrate any local changes into the new file. @@ -605,8 +605,8 @@ _ _ _ /etc/passwd /etc/master.passwd new format; see below /usr/lib/sendmail.cf /etc/sendmail.cf changed pathnames /usr/lib/aliases /etc/aliases may contain changed pathnames -/etc/*.pid /var/run/*.pid - +/etc/*.pid /var/run/*.pid + .T& l l l lfC lfC l. @@ -859,7 +859,7 @@ The ``daemon'' user is used for daemon processes that do not need root privileges. The ``operator'' user-id is used as an account for dumpers so that they can log in without having the root password. -By placing them in the ``operator'' group, +By placing them in the ``operator'' group, they can get read access to the disks. The ``uucp'' login has existed long before \*(4B, and is noted here just to provide a common user-id. @@ -1002,7 +1002,7 @@ privilege to set kernel state. .Sh 3 "Security" .PP The kernel runs with four different levels of security. -Any superuser process can raise the security level, but only +Any superuser process can raise the security level, but only .Fn init (8) can lower it. Security levels are defined as follows: @@ -1027,7 +1027,7 @@ but also inhibits running while the system is multi-user. See .Xr chflags (1) -and the \-\fBo\fP option to +and the \-\fBo\fP option to .Xr ls (1) for information on setting and displaying the immutable and append-only flags. @@ -1165,14 +1165,14 @@ structure into the kernel (e.g. .Fn sendto and .Fn connect ) -have a separate parameter that specifies the +have a separate parameter that specifies the .I sockaddr length, and thus it is not necessary to fill in the .I sa_len field for those system calls. System calls that pass a .I sockaddr -structure back from the kernel (e.g. +structure back from the kernel (e.g. .Fn recvfrom and .Fn accept ) @@ -1319,7 +1319,7 @@ See and .Xr lfs_cleanerd (8) for more information. -For a in-depth description of the implementation and performance +For an in-depth description of the implementation and performance characteristics of log-structured filesystems in general, and this one in particular, see Dr. Margo Seltzer's doctoral thesis, available from the University of California Computer Science Department. @@ -1328,7 +1328,7 @@ We have also added a memory-based filesystem that runs in pageable memory, allowing large temporary filesystems without requiring dedicated physical memory. .PP -The local ``fast filesystem'' has been enhanced to do +The local ``fast filesystem'' has been enhanced to do clustering that allows large pieces of files to be allocated contiguously resulting in near doubling of filesystem throughput. @@ -1355,7 +1355,7 @@ When set on a file, .Xr dump (8) will omit the file from incremental backups but retain them on full backups. -See the ``-h'' flag to +See the ``-h'' flag to .Xr dump (8) for details on how to change this default. The ``nodump'' flag is usually set on core dumps, @@ -1867,7 +1867,7 @@ yacc A new, freely redistributable, significantly faster version. .PP The new versions of .Xr lex (1) -(``flex'') and +(``flex'') and .Xr yacc (1) (``zoo'') should be installed early on if attempting to cross-compile \*(4B on another system. @@ -1889,7 +1889,7 @@ for an example of their use. .Sh 2 "Hints on converting from \*(Ps to \*(4B" .PP This section summarizes changes between -\*(Ps and \*(4B that are likely to +\*(Ps and \*(4B that are likely to cause difficulty in doing the conversion. It does not include changes in the network; see section 5 for information on setting up the network. diff --git a/share/doc/smm/05.fastfs/3.t b/share/doc/smm/05.fastfs/3.t index e2ac4ba..23db86a 100644 --- a/share/doc/smm/05.fastfs/3.t +++ b/share/doc/smm/05.fastfs/3.t @@ -31,6 +31,8 @@ .\" .\" @(#)3.t 8.1 (Berkeley) 6/8/93 .\" +.\" $FreeBSD$ +.\" .ds RH New file system .NH New file system organization @@ -55,7 +57,7 @@ bytes with only two levels of indirection, the minimum size of a file system block is 4096 bytes. The size of file system blocks can be any power of two greater than or equal to 4096. -The block size of a file system is recorded in the +The block size of a file system is recorded in the file system's super-block so it is possible for file systems with different block sizes to be simultaneously accessible on the same system. @@ -80,7 +82,7 @@ For each cylinder group a static number of inodes is allocated at file system creation time. The default policy is to allocate one inode for each 2048 bytes of space in the cylinder group, expecting this -to be far more than will ever be needed. +to be far more than will ever be needed. .PP All the cylinder group bookkeeping information could be placed at the beginning of each cylinder group. @@ -109,7 +111,7 @@ This is because of a requirement that the first 8 kilobytes of the disk be reserved for a bootstrap program and a separate requirement that the cylinder group information begin on a file system block boundary. To start the cylinder group on a file system block boundary, -file systems with block sizes larger than 8 kilobytes +file systems with block sizes larger than 8 kilobytes would have to leave an empty space between the end of the boot block and the beginning of the cylinder group. Without knowing the size of the file system blocks, @@ -131,7 +133,7 @@ In large files, several 4096 byte blocks may be allocated from the same cylinder so that even larger data transfers are possible before requiring a seek. .PP -The main problem with +The main problem with larger blocks is that most UNIX file systems are composed of many small files. A uniformly large block size wastes space. @@ -197,7 +199,7 @@ Figure 1 \- Example layout of blocks and fragments in a 4096/1024 file system. .KE Each bit in the map records the status of a fragment; an ``X'' shows that the fragment is in use, -while a ``O'' shows that the fragment is available for allocation. +while an ``O'' shows that the fragment is available for allocation. In this example, fragments 0\-5, 10, and 11 are in use, while fragments 6\-9, and 12\-15 are free. @@ -256,7 +258,7 @@ a block with the necessary fragments is located, otherwise a full block is located. The remaining new data is written into the located space. .IP 3) -The file contains one or more fragments (and the +The file contains one or more fragments (and the fragments contain insufficient space to hold the new data). If the size of the new data plus the size of the data already in the fragments exceeds the size of a full block, @@ -274,7 +276,7 @@ appended with the new data are written into the allocated space. .PP The problem with expanding a file one fragment at a -a time is that data may be copied many times as a +a time is that data may be copied many times as a fragmented block expands to a full block. Fragment reallocation can be minimized if the user program writes a full block at a time, @@ -345,7 +347,7 @@ with the free space reserve set at 5%. (Compare 11.8% wasted with the old file system to 6.9% waste + 5% reserved space in the new file system.) -.NH 2 +.NH 2 File system parameterization .PP Except for the initial creation of the free list, @@ -353,11 +355,11 @@ the old file system ignores the parameters of the underlying hardware. It has no information about either the physical characteristics of the mass storage device, or the hardware that interacts with it. -A goal of the new file system is to parameterize the +A goal of the new file system is to parameterize the processor capabilities and mass storage characteristics so that blocks can be allocated in an -optimum configuration-dependent way. +optimum configuration-dependent way. Parameters used include the speed of the processor, the hardware support for mass storage transfers, and the characteristics of the mass storage devices. @@ -370,8 +372,8 @@ it is placed. .PP For mass storage devices such as disks, the new file system tries to allocate new blocks -on the same cylinder as the previous block in the same file. -Optimally, these new blocks will also be +on the same cylinder as the previous block in the same file. +Optimally, these new blocks will also be rotationally well positioned. The distance between ``rotationally optimal'' blocks varies greatly; it can be a consecutive block @@ -439,7 +441,7 @@ and the disk pack is then moved to a system that has a processor requiring 4 milliseconds to schedule a disk operation, the throughput will drop precipitously because of lost disk revolutions on nearly every block. -If the eventual target machine is known, +If the eventual target machine is known, the file system can be parameterized for it even though it is initially created on a different processor. Even if the move is not known in advance, @@ -464,7 +466,7 @@ the local allocation routines that use a locally optimal scheme to lay out data blocks. .PP Two methods for improving file system performance are to increase -the locality of reference to minimize seek latency +the locality of reference to minimize seek latency as described by [Trivedi80], and to improve the layout of data to make larger transfers possible as described by [Nevalainen77]. @@ -486,7 +488,7 @@ while spreading out unrelated data. One allocatable resource is inodes. Inodes are used to describe both files and directories. Inodes of files in the same directory are frequently accessed together. -For example, the ``list directory'' command often accesses +For example, the ``list directory'' command often accesses the inode for each file in a directory. The layout policy tries to place all the inodes of files in a directory in the same cylinder group. @@ -547,10 +549,10 @@ a megabyte of data is typically accessible before a long seek must be performed, and the cost of one long seek per megabyte is small. .PP -The global policy routines call local allocation routines with +The global policy routines call local allocation routines with requests for specific blocks. The local allocation routines will -always allocate the requested block +always allocate the requested block if it is free, otherwise it allocates a free block of the requested size that is rotationally closest to the requested block. @@ -558,7 +560,7 @@ If the global layout policies had complete information, they could always request unused blocks and the allocation routines would be reduced to simple bookkeeping. However, maintaining complete information is costly; -thus the implementation of the global layout policy +thus the implementation of the global layout policy uses heuristics that employ only partial information. .PP If a requested block is not available, the local allocator uses @@ -566,7 +568,7 @@ a four level allocation strategy: .IP 1) Use the next available block rotationally closest to the requested block on the same cylinder. It is assumed -here that head switching time is zero. On disk +here that head switching time is zero. On disk controllers where this is not the case, it may be possible to incorporate the time required to switch between disk platters when constructing the rotational layout tables. This, however, @@ -575,7 +577,7 @@ has not yet been tried. If there are no blocks available on the same cylinder, use a block within the same cylinder group. .IP 3) -If that cylinder group is entirely full, +If that cylinder group is entirely full, quadratically hash the cylinder group number to choose another cylinder group to look for a free block. .IP 4) diff --git a/share/doc/smm/06.nfs/1.t b/share/doc/smm/06.nfs/1.t index 0806cad..57d1b9c 100644 --- a/share/doc/smm/06.nfs/1.t +++ b/share/doc/smm/06.nfs/1.t @@ -85,7 +85,7 @@ use of the Sun RPC library. .sh 1 "Mount Problems" .pp There are several problems that can be encountered at the time of an NFS -mount, ranging from a unresponsive NFS server (crashed, network partitioned +mount, ranging from an unresponsive NFS server (crashed, network partitioned from client, etc.) to various interoperability problems between different NFS implementations. .pp diff --git a/share/doc/smm/06.nfs/2.t b/share/doc/smm/06.nfs/2.t index 841dd5f..85e2896 100644 --- a/share/doc/smm/06.nfs/2.t +++ b/share/doc/smm/06.nfs/2.t @@ -34,6 +34,8 @@ .\" .\" @(#)2.t 8.1 (Berkeley) 6/8/93 .\" +.\" $FreeBSD$ +.\" .sh 1 "Not Quite NFS, Crash Tolerant Cache Consistency for NFS" .pp Not Quite NFS (NQNFS) is an NFS like protocol designed to maintain full cache @@ -127,7 +129,7 @@ the number of seconds the server is willing to wait for a client with an expired write caching lease to push dirty writes. .pp The server maintains a \fBmodify_revision\fR number for each file. It is -defined as a unsigned quadword integer that is never zero and that must +defined as an unsigned quadword integer that is never zero and that must increase whenever the corresponding file is modified on the server. It is used by the client to determine whether or not cached data for the file is @@ -400,7 +402,7 @@ modifyrev .(l typedef unsigned hyper modifyrev; .)l -The "modifyrev" is a unsigned quadword integer value that is never zero +The "modifyrev" is an unsigned quadword integer value that is never zero and increases every time the corresponding file is modified on the server. .ip \(bu nqnfs_time diff --git a/share/doc/smm/18.net/7.t b/share/doc/smm/18.net/7.t index 8ccecc8..e165de0 100644 --- a/share/doc/smm/18.net/7.t +++ b/share/doc/smm/18.net/7.t @@ -31,6 +31,8 @@ .\" .\" @(#)7.t 8.1 (Berkeley) 6/8/93 .\" +.\" $FreeBSD$ +.\" .nr H2 1 .br .ne 30v @@ -115,7 +117,7 @@ to carry out this request (if possible). A ``listen'' request always precedes a request to accept a connection. .IP PRU_CONNECT .br -The ``connect'' request indicates the user wants to a establish +The ``connect'' request indicates the user wants to establish an association. The \fIaddr\fP parameter supplied describes the peer to be connected to. The effect of a connect request may vary depending on the protocol. Virtual circuit protocols, diff --git a/share/doc/usd/18.msdiffs/ms.diffs b/share/doc/usd/18.msdiffs/ms.diffs index 1193f6f..10eb449 100644 --- a/share/doc/usd/18.msdiffs/ms.diffs +++ b/share/doc/usd/18.msdiffs/ms.diffs @@ -31,6 +31,8 @@ .\" .\" @(#)ms.diffs 8.1 (Berkeley) 6/8/93 .\" +.\" $FreeBSD$ +.\" .nr LL 6.5i .nr FL 6.0i .if t .nr PD .5v @@ -268,7 +270,7 @@ This document was produced with: \&.OH \'\ef\^IThe -mx Macros\'\'Page %\ef\^P\' \&.EH \'\ef\^IPage %\'\'The -mx Macros\ef\^P\' .DE -Note that it would be a error to have an apostrophe in the header text; +Note that it would be an error to have an apostrophe in the header text; if you need one, you will have to use a different delimiter around the left, center, and right portions of the title. You can use any character as a delimiter, provided it doesn't appear diff --git a/share/doc/usd/21.troff/m1 b/share/doc/usd/21.troff/m1 index ff9194d..0df1d52 100644 --- a/share/doc/usd/21.troff/m1 +++ b/share/doc/usd/21.troff/m1 @@ -1,26 +1,26 @@ .\" Copyright (C) Caldera International Inc. 2001-2002. All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions are .\" met: -.\" +.\" .\" Redistributions of source code and documentation must retain the above .\" copyright notice, this list of conditions and the following .\" disclaimer. -.\" +.\" .\" Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: -.\" +.\" .\" This product includes software developed or owned by Caldera .\" International, Inc. Neither the name of Caldera International, Inc. .\" nor the names of other contributors may be used to endorse or promote .\" products derived from this software without specific prior written .\" permission. -.\" +.\" .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA .\" INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -33,7 +33,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" @(#)m1 8.1 (Berkeley) 8/14/93 .\" .\" $FreeBSD$ @@ -381,7 +381,7 @@ A paired sequence will work because the previous requested value is also remembered. Ignored in \*(NR. .bt -\fB&fz\fI|F|\(+-N\fR off - E The characters in font \fIF\fR will be adjusted to +\fB&fz\fI|F|\(+-N\fR off - E The characters in font \fIF\fR will be adjusted to be in size \(+-\fIN\fR. Characters in the Special Font encountered during the use of font \fIF\fR will have the same size modification. (Use the \fB&fz S\fR request if different treatment of Special Font characters is required). \fB&fz\fR @@ -524,7 +524,7 @@ or, if \fIN\fR is absent, to a place marked by a previous \fBmk\fR. Note that the \fBsp\fR request (\(sc5.3) may be used in all cases instead of \fBrt\fR -by spacing to the absolute place stored in a explicit register; +by spacing to the absolute place stored in an explicit register; e.|g. using the sequence \fB.mk|\fIR\fR ... \fB.sp|~\|\en\fIR\fBu\fR. .mh Text Filling, Adjusting, and Centering @@ -532,7 +532,7 @@ Text Filling, Adjusting, and Centering Filling and adjusting. Normally, words are collected from input text lines -and assembled into a output text line +and assembled into an output text line until some word doesn't fit. An attempt is then made to hyphenate the word to assemble a part @@ -589,7 +589,7 @@ using \fBtr\fR (\(sc10.5). .tr &. .sc Interrupted text. -The copying of a input line in \fInofill\fR +The copying of an input line in \fInofill\fR (non-fill) mode can be \fIinterrupted\fR by terminating the partial line with a \fB\ec\fR. The \fInext\fR encountered input text line will be considered to be a continuation diff --git a/share/doc/usd/21.troff/m2 b/share/doc/usd/21.troff/m2 index a0130cc..b94f478 100644 --- a/share/doc/usd/21.troff/m2 +++ b/share/doc/usd/21.troff/m2 @@ -1,26 +1,26 @@ .\" Copyright (C) Caldera International Inc. 2001-2002. All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions are .\" met: -.\" +.\" .\" Redistributions of source code and documentation must retain the above .\" copyright notice, this list of conditions and the following .\" disclaimer. -.\" +.\" .\" Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: -.\" +.\" .\" This product includes software developed or owned by Caldera .\" International, Inc. Neither the name of Caldera International, Inc. .\" nor the names of other contributors may be used to endorse or promote .\" products derived from this software without specific prior written .\" permission. -.\" +.\" .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA .\" INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -33,7 +33,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" @(#)m2 8.1 (Berkeley) 8/14/93 .\" .\" $FreeBSD$ @@ -167,7 +167,7 @@ arguments is in the \fB.$\fR register. No arguments are available at the top (non-macro) level in this implementation. Because string referencing is implemented -as a input-level push down, +as an input-level push down, no arguments are available from \fIwithin\fR a string. No arguments are available within a trap-invoked macro. .pg diff --git a/share/doc/usd/22.trofftut/tt04 b/share/doc/usd/22.trofftut/tt04 index f78ec6d..c44c94b 100644 --- a/share/doc/usd/22.trofftut/tt04 +++ b/share/doc/usd/22.trofftut/tt04 @@ -4,28 +4,28 @@ .\" .\" @(#)tt04 8.1 (Berkeley) 6/8/93 .\" Copyright (C) Caldera International Inc. 2001-2002. All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions are .\" met: -.\" +.\" .\" Redistributions of source code and documentation must retain the above .\" copyright notice, this list of conditions and the following .\" disclaimer. -.\" +.\" .\" Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: -.\" +.\" .\" This product includes software developed or owned by Caldera .\" International, Inc. Neither the name of Caldera International, Inc. .\" nor the names of other contributors may be used to endorse or promote .\" products derived from this software without specific prior written .\" permission. -.\" +.\" .\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA .\" INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -38,7 +38,7 @@ .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE .\" OR OTHERWISE) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" $FreeBSD$ .\" .NH @@ -114,7 +114,7 @@ makes them one inch .ul long. .PP -With +With .BD .in , .BD .ll and @@ -139,7 +139,7 @@ as for most horizontally oriented commands is ems; an em is roughly the width of the letter `m' in the current point size. -(Precisely, a em in size +(Precisely, an em in size .ul p is diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt index 8444908..a323a84 100644 --- a/share/examples/ipfilter/examples.txt +++ b/share/examples/ipfilter/examples.txt @@ -350,7 +350,7 @@ in brackets following the "return-icmp" directive: block return-icmp (3) in proto udp from any to any port > 30000 block return-icmp (port-unr) in proto udp from any to any port > 30000 -Those two examples are equivalent, and return a ICMP port unreachable error +Those two examples are equivalent, and return an ICMP port unreachable error packet to in response to any UDP packet received destined for a port greater than 30,000. ------------------------------------------------------------------------ diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt index baef95c..73a1ecf 100644 --- a/share/examples/ipfilter/ipf-howto.txt +++ b/share/examples/ipfilter/ipf-howto.txt @@ -2182,7 +2182,7 @@ ing.ps.gz> -34- -This is a ICMP router discovery broadcast. We can tell by +This is an ICMP router discovery broadcast. We can tell by the ICMP type 9/0. Finally, ipmon also lets us look at the NAT table in action. diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ index b8e5be4..b32ce7b 100644 --- a/share/examples/isdn/FAQ +++ b/share/examples/isdn/FAQ @@ -485,16 +485,16 @@ kind of problem to look into his BIOS. i4b now works for me, I had a USB-device interfering on IRQ 9, which was supposed to be only for my Creatix Card. (NetBSD 1.3, Creatix) - + Strange enough, my DOS s0-test worked, are they just polling the card? - + Even when the testsoftware under DOS is working, don't be shure, that your hw-setup is correct for xxx(x)BSD. Triplecheck all your IRQ and enable and disable PNP to triple-verify. Even unconfigured devices can block your card. ..... - + And that took me more than 2 months to discover :-(((( - + (from Andreas Lohrum, andreas.lohrum@consol.de) @@ -1016,7 +1016,7 @@ But I could not use the card, because I forgot Q: Hi, - I am trying to set up a ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD + I am trying to set up an ELSA QuickStep 1000pro PCI ISDN adaptor in a FreeBSD 3.3 box. I configured the kernel according to the i4b.ps documentation. At boottime, these messages are displayed: diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview index e8e09e2..8313506 100644 --- a/share/examples/isdn/Overview +++ b/share/examples/isdn/Overview @@ -18,7 +18,7 @@ Contents: Layer 2 Layer 3 Debugging control - Layer 4 + Layer 4 ISDN protocol trace @@ -43,7 +43,7 @@ Functional block diagram | debug | | Layer 4 - common call control interface | | ISDN | |control| | | | trace | +:-:-:--+ +----------------------------------------------------+ +--------+ - : : : ^ ^ ^ + : : : ^ ^ ^ : : : Call | various ptr arrays | Call % . . . Control | in i4b_l3l4.h | Control % V V % @@ -111,14 +111,14 @@ Layer 1 routines. These routines handle the card/manufacturer specific stuff required to talk to a particular card. - This addresses of the read/write routines are put into a arrays found + The addresses of the read/write routines are put into an array found in struct isic_softc and they are later called by the macros: ISAC_READ(r), ISAC_WRITE(r,v), ISAC_RDFIFO(b,s), ISAC_WRFIFO(b,s), HSCX_READ(n,r), HSCX_WRITE(n,r,v), HSCX_RDFIFO(n,b,s), HSCX_WRFIFO(n,b,s) (see file layer1/i4b_l1.h) - + Files currently used for this purpose are - i4b_avm_a1.c AVM A1 and AVM Fritz!Card drivers - i4b_ctx_s0P.c Creatix S0 PnP (experimental!) @@ -256,7 +256,7 @@ Debugging control sources. It is only usable for passive cards. -Layer 4 +Layer 4 ======= (7) Layer 4 is "just" an abstraction layer used to shield the differences diff --git a/share/examples/isdn/i4brunppp/README b/share/examples/isdn/i4brunppp/README index ea0ba9a..81ebe75 100644 --- a/share/examples/isdn/i4brunppp/README +++ b/share/examples/isdn/i4brunppp/README @@ -3,12 +3,12 @@ $FreeBSD$ BEWARE: HIGHLY EXPERIMENTAL! --------------------------- -This program is used in conjunction with a isdnd.rc entry similar to +This program is used in conjunction with an isdnd.rc entry similar to regexpr = "ULPPP.*call active" # look for matches in log messages regprog = i4brunppp # execute program when match is found -this one (see also i4brunppp-isdnd.rc). +this one (see also i4brunppp-isdnd.rc). i4brunppp _must_ be put into /etc/isdn! @@ -16,4 +16,3 @@ When an active call is detected, isdnd fires off i4brunppp, which attaches the rbch device used to stdin/stdout and then runs ppp which is given the "-direct" command and the string "inc_rbchX" (where X is the i4brbch unit number) as arguments. - diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c index cb239d8..7d1fe3c 100644 --- a/share/examples/isdn/i4brunppp/i4brunppp.c +++ b/share/examples/isdn/i4brunppp/i4brunppp.c @@ -35,8 +35,8 @@ * * BEWARE: HIGHLY EXPERIMENTAL! * --------------------------- - * - * This program is used in conjunction with a isdnd.rc entry similar to + * + * This program is used in conjunction with an isdnd.rc entry similar to * * regexpr = "ULPPP.*call active" # look for matches in log messages * regprog = i4brunppp # execute program when match is found @@ -62,7 +62,7 @@ #include #include -#define I4BDEVICE "/dev/i4b" +#define I4BDEVICE "/dev/i4b" #define PPPPROG "/usr/sbin/ppp" #define PPPNAME "ppp" @@ -85,21 +85,21 @@ main(int argc, char **argv) char *p = "DeadPointer"; int found; int i; - + #ifdef PPPDEBUG FILE *dfp; time_t tim; register struct tm *tp; #endif - + /* open syslog */ - + (void)openlog("i4brunppp", LOG_PID|LOG_CONS|LOG_NDELAY, LOG_USER); #ifdef PPPDEBUG /* open debug log */ - + if((dfp = fopen("/tmp/i4brunppp-debug.log", "a")) == NULL) { syslog(LOG_INFO, "cannot open logfile: %s", strerror(errno)); @@ -116,9 +116,9 @@ main(int argc, char **argv) #endif /* check if this is the right message */ - + found = 0; - + for(i=0; i < argc; i++) { if((strstr(argv[i], VERIFYSTRING)) != NULL) @@ -135,11 +135,11 @@ main(int argc, char **argv) #endif exit(0); } - + found = 0; /* check if we got a good device name */ - + for(; i < argc; i++) { if((p = strstr(argv[i], DEVSTRING)) != NULL) @@ -157,10 +157,10 @@ main(int argc, char **argv) exit(0); } - /* everything ok, now prepare for running ppp */ + /* everything ok, now prepare for running ppp */ /* close all file descriptors */ - + i = getdtablesize(); for(;i >= 0; i--) @@ -168,7 +168,7 @@ main(int argc, char **argv) close(i); /* fiddle a terminating zero after the rbch unit number */ - + p += strlen(DEVSTRING); if(isdigit(*p) && isdigit(*(p+1))) @@ -177,16 +177,16 @@ main(int argc, char **argv) *(p+1) = '\0'; /* construct /dev/i4brbchX device name */ - + sprintf(buffer, "%s%s%s", I4BDEVICE, DEVSTRING, p); /* open the rbch device as fd 0 = stdin */ - + rbch_fd = open(buffer, O_RDWR); if(rbch_fd != 0) { - if(rbch_fd < 0) + if(rbch_fd < 0) syslog(LOG_INFO, "cannot open %s: %s", buffer, strerror(errno)); else syslog(LOG_INFO, "cannot open %s as fd 0 (is %d): %s", buffer, rbch_fd, strerror(errno)); @@ -194,10 +194,10 @@ main(int argc, char **argv) } /* dup rbch device fd as fd 1 = stdout */ - + if((i = dup(rbch_fd)) != 1) { - if(i < 0) + if(i < 0) syslog(LOG_INFO, "cannot dup rbch_fd: %s", strerror(errno)); else syslog(LOG_INFO, "cannot dup rbch as fd 1 (is %d): %s", i, strerror(errno)); @@ -205,13 +205,13 @@ main(int argc, char **argv) } /* construct the label for ppp's ppp.conf file */ - + sprintf(buffer, "%s%s%s", PPPLABEL, DEVSTRING, p); syslog(LOG_INFO, "executing: %s %s %s %s", PPPPROG, PPPNAME, PPPARG1, buffer); /* execute ppp */ - + if((execl(PPPPROG, PPPNAME, PPPARG1, buffer, NULL)) == -1) { syslog(LOG_INFO, "cannot exec: %s", strerror(errno)); diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample index db6cdf1..9d0539d 100644 --- a/share/examples/ppp/ppp.conf.sample +++ b/share/examples/ppp/ppp.conf.sample @@ -108,7 +108,7 @@ PAPorCHAPpmdemand: # # With static IP numbers, our setup is similar to dynamic: # Remember, ppp.linkup is searched for a "192.244.176.44" label, then -# a "ondemand" label, and finally the "MYADDR" label. +# an "ondemand" label, and finally the "MYADDR" label. # ondemand: set phone 1234567 @@ -354,16 +354,16 @@ dodgynet: # If the remote host allowed IP forwarding and we wanted to use it, the # following rules could be split into two groups to separately validate # the source and destination addresses. - set filter dial 7 permit 172.17.16.0/20 172.17.20.248 - set filter dial 8 permit 172.17.36.0/22 172.17.20.248 - set filter dial 9 permit 172.17.118.0/26 172.17.20.248 - set filter dial 10 permit 10.123.5.0/24 172.17.20.248 + set filter dial 7 permit 172.17.16.0/20 172.17.20.248 + set filter dial 8 permit 172.17.36.0/22 172.17.20.248 + set filter dial 9 permit 172.17.118.0/26 172.17.20.248 + set filter dial 10 permit 10.123.5.0/24 172.17.20.248 # Once the link's up, limit outgoing access to the specified hosts - set filter out 0 4 172.17.16.0/20 172.17.20.248 - set filter out 1 4 172.17.36.0/22 172.17.20.248 - set filter out 2 4 172.17.118.0/26 172.17.20.248 - set filter out 3 deny ! 10.123.5.0/24 172.17.20.248 + set filter out 0 4 172.17.16.0/20 172.17.20.248 + set filter out 1 4 172.17.36.0/22 172.17.20.248 + set filter out 2 4 172.17.118.0/26 172.17.20.248 + set filter out 3 deny ! 10.123.5.0/24 172.17.20.248 # Allow established TCP connections set filter out 4 permit 0 0 tcp estab @@ -481,7 +481,7 @@ direct-client: set ifaddr 10.0.4.2 10.0.4.1 enable lqr accept lqr - + direct-server: set timeout 0 set lqrperiod 10 @@ -567,7 +567,7 @@ inet-loop: set login set ifaddr 127.0.0.2 127.0.0.3 set server /var/run/ppp/loop "" 0177 - + inet-loop-in: set timeout 0 set log phase lcp ipcp command @@ -687,8 +687,8 @@ mloop: clone 1 2 3 link deflink remove # dial - # link 2 dial - # link 3 dial + # link 2 dial + # link 3 dial mloop-in: set timeout 0 # No idle timer @@ -780,10 +780,10 @@ loop: set device "!ppp -direct loop-in" set dial set login - set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255 + set ifaddr 10.0.1.1/0 10.0.10.1-10.0.19.255 disable deflate pred1 mppe deny deflate pred1 mppe - + loop-in: set timeout 0 set log diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4 index 24d9098..b19b0de 100644 --- a/share/man/man4/keyboard.4 +++ b/share/man/man4/keyboard.4 @@ -117,7 +117,7 @@ the exact key meanings from the kernel (fx. used by the X server). .Pp The function keys can be programmed using the SETFKEY ioctl call. .Pp -This ioctl takes a argument of the type fkeyarg_t: +This ioctl takes an argument of the type fkeyarg_t: .Bd -literal -offset indent struct fkeyarg { u_short keynum; diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4 index bb7eb57..9b62058 100644 --- a/share/man/man4/polling.4 +++ b/share/man/man4/polling.4 @@ -34,7 +34,7 @@ which ultimately reduces the chances of livelock in the system. In the normal, interrupt-based mode, devices generate an interrupt whenever they need attention. This in turn causes a -context switch and the execution of a interrupt handler +context switch and the execution of an interrupt handler which performs whatever processing is needed by the device. The duration of the interrupt handler is potentially unbounded unless the device driver has been programmed with real-time -- cgit v1.1