move the ugly .br to .nf/.fi combos

1 files changed, 73 insertions, 114 deletions

diff --git a/man/portage.5 b/man/portage.5
index c6bc961..c44ddfb 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -12,54 +12,43 @@ If you are looking for information on how to emerge something, please see
 .SH SYNOPSIS
 .TP
 .BR /etc/
+.nf
 make.globals
-.br
 .BR make.conf (5)
+.fi
 .TP
 .BR /etc/make.profile/
+.nf
 deprecated
-.br
 make.defaults
-.br
 packages
-.br
 packages.build
-.br
 use.defaults
-.br
 use.mask
-.br
 virtuals
+.fi
 .TP
 .BR /etc/portage/
+.nf
 bashrc
-.br
 package.mask
-.br
 package.unmask
-.br
 package.keywords
-.br
 package.use
-.br
 mirrors
-.br
 categories
+.fi
 .TP
 .BR /usr/portage/profiles/
+.nf
 arch.list
-.br
 categories
-.br
 package.mask
-.br
 thirdpartymirrors
-.br
 use.desc
-.br
 use.local.desc
-.br
 use.mask
+.fi
 .TP
 .BR /var/lib/portage/
 world
@@ -156,35 +145,27 @@ packages/versions on a per-profile basis.  The second is to provide the
 list of packages that compose the special \fIsystem\fR class.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one DEPEND atom per line of what to mask OUT
-.br
 \- packages to be added to the system class begin with a *
-.br
+.fi
 .I Note:
 In a cascading profile setup, you can remove packages in children 
 profiles which were added by parent profiles by prefixing the atom with 
 a '-'
 
 .I Example:
-.br
+.nf
 # i am a comment !
-.br
 # only allow versions of glibc less than 2.3
-.br
 <sys-libs/glibc-2.3
-.br
 # add any version of bash to the system class
-.br
 *app-shells/bash
-.br
 # only allow versions of readline earlier than 4.2
-.br
 # and add it to the system class
-.br
 *<sys-libs/readline-4.2
+.fi
 .TP
 .BR packages.build
 A list of packages (one per line) that make up a stage1 tarball.  Really only 
@@ -202,33 +183,29 @@ have media-libs/libsdl emerged, then portage automagically sticks "sdl"
 into our USE for us.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one USE flag per line with a list of DEPEND atom bases
+.fi
 
 .I Example:
-.br
-.br
+.nf
 # media-libs/libsdl will activate "sdl"
-.br
 sdl        media-libs/libsdl
-.br
 # activate tcltk only if we have both 
-.br
 # dev-lang/tcl and dev-lang/tk
-.br
 tcltk      dev-lang/tcl   dev-lang/tk
+.fi
 .TP
 .BR use.mask
 Some USE flags don't make sense on some archs (for example altivec on 
 non-ppc or mmx on non-x86).  Here we list the masked ones.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one USE flag per line
+.fi
 .TP
 .BR virtuals
 This controls what packages will provide a virtual by default.  For example, 
@@ -239,20 +216,18 @@ net-mail/ssmtp as the default (as defined in the virtuals file) because it's
 the package that does the very bare minimum to send e-mail.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one virtual and DEPEND atom base pair per line
+.fi
 
 .I Example:
-.br
+.nf
 # use net-mail/ssmtp as the default mta
-.br
 virtual/mta           net-mail/ssmtp
-.br
 # use app-dicts/aspell-en as the default dictionary
-.br
 virtual/aspell-dict   app-dicts/aspell-en
+.fi
 .RE
 .TP
 .BR /etc/portage/
@@ -268,20 +243,18 @@ work well for you.  For example, you swear by the Nvidia drivers, but only
 versions earlier than 1.0.4496.  No problem!
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one DEPEND atom per line
+.fi
 
 .I Example:
-.br
+.nf
 # mask out versions 1.0.4496 of the nvidia
-.br
 # drivers and later
-.br
 >=media-video/nvidia-kernel-1.0.4496
-.br
 >=media-video/nvidia-glx-1.0.4496
+.fi
 .TP
 .BR package.unmask
 Just like package.mask above except here you list packages you want to 
@@ -295,24 +268,20 @@ stable machine or vice versa.  This will allow you to augment ACCEPT_KEYWORDS
 for a single package.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one DEPEND atom per line followed by additional ACCEPT_KEYWORDS 
+.fi
 
 .I Example:
-.br
+.nf
 # always use unstable libgd
-.br
 media-libs/libgd ~x86
-.br
 # only use stable mplayer
-.br
 media-video/mplayer -~x86
-.br
 # use a package that is marked -*
-.br
 >=sys-kernel/linux-headers-2.6 -*
+.fi
 .TP
 .BR package.use
 Per-package USE flags.  Useful for tracking local USE flags or for 
@@ -321,20 +290,18 @@ and thus you want documentation for it, but you don't want
 documentation for QT.  Easy as pie my friend!
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one DEPEND atom per line followed by space separated list of USE flags
+.fi
 
 .I Example:
-.br
+.nf
 # turn on docs for GTK 2.x
-.br
 =x11-libs/gtk+-2* doc
-.br
 # disable mysql support for QT
-.br
 x11-libs/qt -mysql
+.fi
 .TP
 .BR mirrors
 Whenever portage encounters a mirror:// style URL it will look up the actual 
@@ -345,24 +312,22 @@ before GENTOO_MIRRORS and be used even if the package has
 RESTRICT="nomirror".
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- mirror type followed by a list of hosts
+.fi
 
 .I Example:
-.br
+.nf
 # local private mirrors used only by my company
-.br
 local ftp://192.168.0.3/mirrors/gentoo http://192.168.0.4/distfiles
 
 # people in japan would want to use the japanese mirror first
-.br
 sourceforge http://keihanna.dl.sourceforge.net/sourceforge
 
 # people in tawain would want to use the local gnu mirror first
-.br
 gnu ftp://ftp.nctu.edu.tw/UNIX/gnu/
+.fi
 .TP
 .BR categories
 A simple list of valid categories that may be used in /usr/portage, 
@@ -370,14 +335,15 @@ PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)).  This allows for custom
 categories to be created.
 
 .I Format:
-.br
+.nf
 \- one category per line
+.fi
 
 .I Example:
-.br
+.nf
 app-hackers
-.br
 media-other
+.fi
 .RE
 .TP
 .BR /usr/portage/profiles/
@@ -389,34 +355,33 @@ these settings, you can use the files in \fB/etc/portage/\fR.
 A list of all valid KEYWORDS.  This does not include modifiers.
 
 .I Format:
-.br
+.nf
 \- one KEYWORD per line
+.fi
 
 .I Example:
-.br
+.nf
 x86
-.br
 ppc
-.br
 sparc
+.fi
 .TP
 .BR categories
 A simple list of valid categories that may be used in /usr/portage, 
 PORTDIR_OVERLAY, and PKGDIR (see \fBmake.conf\fR(5)).
 
 .I Format:
-.br
+.nf
 \- one category per line
+.fi
 
 .I Example:
-.br
+.nf
 app-admin
-.br
 dev-lang
-.br
 games-strategy
-.br
 sys-kernel
+.fi
 .TP
 .BR package.mask
 This contains a list of DEPEND atoms for packages that should not be installed 
@@ -426,79 +391,73 @@ versions due to security issues.  ALWAYS include a comment explaining WHY the
 package has been masked and WHO is doing the masking.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- one DEPEND atom per line
+.fi
 
 .I Example:
-.br
+.nf
 # masked for security reasons
-.br
 <sys-libs/zlib-1.1.4
-.br
 # <caleb@gentoo.org> (10 Sep 2003)
-.br
 # new kde betas
-.br
 =kde-base/kde-3.2.0_beta1
-.br
 =kde-base/kdeaccessibility-3.2.0_beta1
+.fi
 .TP
 .BR thirdpartymirrors
 Controls the mapping of mirror:// style URLs to actual lists of 
 mirrors.  Keeps us from overloading a single server.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- mirror type followed by a list of hosts
+.fi
 
 .I Example:
-.br
+.nf
 sourceforge http://aleron.dl.sourceforge.net/sourceforge http://unc.dl.sourceforge.net/sourceforge
 
 gentoo http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/ ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo/distfiles
 
 kernel http://www.kernel.org/pub http://www.us.kernel.org/pub
+.fi
 .TP
 .BR use.desc
 All global USE flags must be listed here with a description of what they do.  
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- use flag \- some description
+.fi
 
 .I Example:
-.br
+.nf
 3dfx - Adds support for 3dfx video cards
-.br
 acl - Adds support for Access Control Lists
-.br
 doc - Adds extra documentation
+.fi
 .TP
 .BR use.local.desc
 All local USE flags must be listed here along with the package and a 
 description.
 
 .I Format:
-.br
+.nf
 \- comments begin with #
-.br
 \- package:use flag \- description
+.fi
 
 .I Example:
-.br
+.nf
 app-editors/nano:justify - Toggle the justify option
-.br
 dev-games/clanlib:clanJavaScript - Enables javascript support
-.br
 dev-libs/DirectFB:fusion - add Multi Application support
-.br
 games-emulation/xmess:net - Add network support
+.fi
 .TP
 .BR use.mask
 Just like the \fBuse.mask\fR found in \fB/etc/make.profile/\fR.  See 
@@ -518,23 +477,23 @@ already, then "dev-php/mod_php" is recorded in the world file but
 "net-www/apache" is not.  For more information, review \fBemerge\fR(1).
 
 .I Format:
-.br
+.nf
 \- one DEPEND atom base per line
+.fi
 
 .I Example:
-.br
+.nf
 games-misc/fortune-mod-gentoo-dev
-.br
 dev-libs/uclibc
-.br
 app-cdr/cdemu
+.fi
 .RE
 .SH AUTHORS
+.nf
 Marius Mauch <genone@gentoo.org>
-.br
 Mike Frysinger <vapier@gentoo.org>
-.br
 Drake Wyrm <wyrm@haell.com>
+.fi
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH "SEE ALSO"
@@ -543,4 +502,4 @@ Please report bugs via http://bugs.gentoo.org/
 .BR ebuild (5),
 .BR make.conf (5)
 .SH "CVS HEADER"
-$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/portage.5,v 1.13 2004/09/15 20:51:35 vapier Exp $
+$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/portage.5,v 1.14 2004/09/15 21:07:01 vapier Exp $