summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-07-09 20:23:35 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-07-09 20:23:35 +0000
commitcbb34a26ceee69f55915f5f8957a71626134852f (patch)
tree25d15fadcce764601752f0511ef172aeeaa9c149
parentf02d7704d048fcc1fd8e5ce7f521ee5ed990ce21 (diff)
fix some lists and some typos;
-rw-r--r--share/man/man5/bsd.port.mk.534
-rw-r--r--share/man/man5/elf.512
-rw-r--r--share/man/man5/files.conf.512
3 files changed, 25 insertions, 33 deletions
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index a0200f84263..573776f785e 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.96 2003/07/09 10:37:51 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.97 2003/07/09 20:23:34 jmc Exp $
.\"
.\" Copyright (c) 2000 Marc Espie
.\"
@@ -602,7 +602,7 @@ Display the errors before making any target, and if any error starts with
.Qq Fatal: ,
do not make anything.
For instance:
-.Bd -literal -indent
+.Bd -literal -offset indent
\&.if !defined(COMMENT)
ERRORS+="Fatal: Missing comment"
\&.endif
@@ -614,7 +614,7 @@ is not empty), this is the contents of a case statement, used to extract files.
Fragments are automatically appended to extract tar and zip
archives, so that the default case is equivalent to the following shell
fragment:
-.Bd -literal -indent
+.Bd -literal
set -e
cd ${WRKDIR}
for archive in ${EXTRACT_ONLY}
@@ -873,7 +873,7 @@ distribution patches.
Fragments are automatically appended to handle gzip'ed and bzip'ed
patches, so that the default case is equivalent to the following shell
fragment:
-.Bd -literal -indent
+.Bd -literal
set -e
cd ${FULLDISTDIR}
for patchfile in ${_PATCHFILES}
@@ -1521,10 +1521,10 @@ be taken care of by the package itself (for instance, ldconfig, or
texinfo's install-info).
.Pp
If no do-install override is present, the port is installed using
-.Bd -literal -indent offset
- env -i ${MAKE_ENV}
- PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} TRUEPREFIX=${PREFIX}
- ${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+.Bd -literal -offset 2n
+env -i ${MAKE_ENV}
+PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} TRUEPREFIX=${PREFIX}
+${MAKE_PROGRAM} ${FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
.Ed
.Pp
Note that this does set both PREFIX and ${DESTDIRNAME}.
@@ -1551,14 +1551,14 @@ When building the port, set
.Li "FLAVOR='option1 option2...'"
to build a specific flavor of the port.
The Makefile should test the value of FLAVOR as follows:
-.Bd -literal
- FLAVOR?=
- .if ${FLAVOR:L:Moption1}
- # what to do if option1
- .endif
- .if ${FLAVOR:L:Moption2}
- # what to do if option2
- .endif
+.Bd -literal -offset indent
+FLAVOR?=
+\&.if ${FLAVOR:L:Moption1}
+# what to do if option1
+\&.endif
+\&.if ${FLAVOR:L:Moption2}
+# what to do if option2
+\&.endif
.Ed
.Pp
.Pa bsd.port.mk
@@ -1658,7 +1658,7 @@ in the packing-list template trigger the inclusion of the
.Pa ${PKGDIR}/PFRAG.shared${SUBPACKAGE}
or
.Pa ${PKGDIR}/PFRAG.no-shared${SUBPACKAGE} .
-.br
+.Pp
Similarly, if FLAVORS lists flav1, then the line
.Li "%%flav1%%"
(resp.
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 6a82670be4e..f2b53d8d054 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf.5,v 1.9 2003/06/06 13:28:13 jmc Exp $
+.\" $OpenBSD: elf.5,v 1.10 2003/07/09 20:23:33 jmc Exp $
.\"Copyright (c) 1999 Jeroen Ruigrok van der Werven
.\"All rights reserved.
.\"
@@ -127,7 +127,6 @@ typedef struct {
Elf32_Half e_shstrndx;
} Elf32_Ehdr;
.Ed
-.Pp
.Bd -literal -offset indent
typedef struct {
unsigned char e_ident[EI_NIDENT];
@@ -160,7 +159,7 @@ and may contain values which start with the prefix
.Sy ELF .
The following macros are defined:
.Pp
-.Bl -tag -width "EI_VERSION" -compact .\" EI_ABIVERSION
+.Bl -tag -width "EI_VERSION" -compact \" EI_ABIVERSION
.It Dv EI_MAG0
The first byte of the magic number.
It must be filled with
@@ -452,7 +451,6 @@ and
members.
As with the ELF executable header, the program header
also has different versions depending on the architecture:
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf32_Word p_type;
@@ -465,7 +463,6 @@ typedef struct {
Elf32_Word p_align;
} Elf32_Phdr;
.Ed
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf64_Half p_type;
@@ -674,7 +671,6 @@ typedef struct {
Elf32_Word sh_entsize;
} Elf32_Shdr;
.Ed
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf64_Half sh_name;
@@ -1119,7 +1115,6 @@ An object file's symbol table holds information needed to locate and
relocate a program's symbolic definitions and references.
A symbol table
index is a subscript into this array.
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf32_Word st_name;
@@ -1130,7 +1125,6 @@ typedef struct {
Elf32_Half st_shndx;
} Elf32_Sym;
.Ed
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf64_Half st_name;
@@ -1258,7 +1252,6 @@ program image.
Relocation entries are these data.
.Pp
Relocation structures that do not need an addend:
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf32_Addr r_offset;
@@ -1273,7 +1266,6 @@ typedef struct {
.Ed
.Pp
Relocation structures that need an addend:
-.Pp
.Bd -literal -offset indent
typedef struct {
Elf32_Addr r_offset;
diff --git a/share/man/man5/files.conf.5 b/share/man/man5/files.conf.5
index 63e809440c6..b1bb6174c25 100644
--- a/share/man/man5/files.conf.5
+++ b/share/man/man5/files.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: files.conf.5,v 1.6 2003/05/10 21:27:58 jmc Exp $
+.\" $OpenBSD: files.conf.5,v 1.7 2003/07/09 20:23:34 jmc Exp $
.\"
.\" Copyright (c) 2002 Miodrag Vallat.
.\" All rights reserved.
@@ -43,7 +43,7 @@ The
.Pa files.*
rules base are simple, human-readable, text files.
Empty lines, as well as text prefixed by the
-.Dq \&#
+.Dq #
character, are ignored.
.\"
.Ss Device tree concept
@@ -64,7 +64,7 @@ which is itself reported as attached to a fictitious
node.
There is no restriction on the
.Dq children
-a device node may have ;
+a device node may have;
some device drivers can attach themselves to different kinds of parent devices.
For example, the logical
.Xr scsibus 4
@@ -294,7 +294,7 @@ Dependencies are based upon attributes and device names.
Multiple dependencies can be written using the
.Dq \&|
and
-.Dq \&&
+.Dq &
operators.
For example, the line
.Bl -item -offset indent -compact
@@ -362,7 +362,7 @@ rule, even if it is never referenced from the kernel configuration file.
.\"
.Pa sys/arch/machine/conf/files.machine
must also supply the following special commands:
-.Bl -tag -width maxpartitions .\" -compact
+.Bl -tag -width maxpartitions \" -compact
.It Ar maxpartitions
Defines how many partitions are available on disk block devices, usually 16.
This value is used by
@@ -380,7 +380,7 @@ in the kernel configuration file does not fit in the specified range.
.El
.\"
.Sh FILES
-.Bl -tag -width XXX -compact .\" deliberately small width
+.Bl -tag -width XXX -compact \" deliberately small width
.It Pa sys/arch/machine/conf/files.machine
Rules for architecture-dependent files, for the
.Dq machine