From d306467b745ed58f4b8e9a2167c4b26db8075974 Mon Sep 17 00:00:00 2001 From: Larry Lawrence Date: Sun, 6 Apr 2003 19:30:52 +0000 Subject: [PATCH] multimedia editing git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@830 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- .../djb/daemontools/daemontools-man-exp.xml | 4 +- .../djb/daemontools/daemontools-man-intro.xml | 2 +- basicnet/mailnews/mutt/mutt-config.xml | 2 +- content/databases/db/db-desc.xml | 52 ++++++++++++------- gnome/core/desktop/gnome-desktop-intro.xml | 2 +- .../cdparanoia/CDParanoia-config.xml | 2 - multimedia/audioutils/mpg123/mpg123-intro.xml | 4 +- multimedia/audioutils/xmms/XMMS-config.xml | 2 +- multimedia/audioutils/xmms/XMMS-desc.xml | 3 +- multimedia/audioutils/xmms/XMMS-intro.xml | 5 +- multimedia/cdwriteutils/kernel.xml | 6 +-- multimedia/libdriv/esound/esound-exp.xml | 2 +- multimedia/libdriv/libao.xml | 1 - multimedia/libdriv/libao/libao-inst.xml | 2 +- multimedia/libdriv/nas/nas-desc.xml | 4 +- multimedia/libdriv/nas/nas-exp.xml | 4 +- multimedia/libdriv/nas/nas-intro.xml | 1 + multimedia/libdriv/nas/nas.ent | 1 + multimedia/libdriv/sdl/SDL-desc.xml | 2 +- multimedia/libdriv/sdl/SDL-intro.xml | 3 +- multimedia/videoutils/ffmpeg/ffmpeg-intro.xml | 2 +- postlfs/security/pam/linux_pam-config.xml | 2 +- pst/printing/cups/cups-config.xml | 2 +- pst/printing/cups/cups-exp.xml | 4 +- pst/printing/cups/cups-intro.xml | 2 +- pst/printing/gs/gs-exp.xml | 4 +- pst/printing/lprng/lprng-desc.xml | 2 +- pst/printing/printing.xml | 1 - pst/scanning/sane/sane-desc.xml | 6 +-- pst/scanning/sane/sane-exp.xml | 2 +- pst/scanning/xsane/xsane-exp.xml | 2 +- 31 files changed, 72 insertions(+), 61 deletions(-) diff --git a/basicnet/djb/daemontools/daemontools-man-exp.xml b/basicnet/djb/daemontools/daemontools-man-exp.xml index e50f969fef..176107b02b 100644 --- a/basicnet/djb/daemontools/daemontools-man-exp.xml +++ b/basicnet/djb/daemontools/daemontools-man-exp.xml @@ -1,8 +1,8 @@ Command explanations -gzip -9 *.8 : You can compress the manpages -to save space, but it isn't needed for the manpages to work. +gzip -9 *.8 : You can compress the man pages +to save space, but it isn't needed for the man pages to work. package/compile : This command actually compiles the source and puts the binaries in a command directory. diff --git a/basicnet/djb/daemontools/daemontools-man-intro.xml b/basicnet/djb/daemontools/daemontools-man-intro.xml index 03cb1a0906..fe0ac929b2 100644 --- a/basicnet/djb/daemontools/daemontools-man-intro.xml +++ b/basicnet/djb/daemontools/daemontools-man-intro.xml @@ -7,7 +7,7 @@ Version used: &daemontools-man-version; Package size: &daemontools-man-size; Estimated Disk space required: &daemontools-man-buildsize; -The Daemontools package does not come with manpages, so install +The Daemontools package does not come with man pages, so install this package if you want online help with the daemontools programs. diff --git a/basicnet/mailnews/mutt/mutt-config.xml b/basicnet/mailnews/mutt/mutt-config.xml index 3ecf478950..379ab425b0 100644 --- a/basicnet/mailnews/mutt/mutt-config.xml +++ b/basicnet/mailnews/mutt/mutt-config.xml @@ -10,7 +10,7 @@ Configuration Information No changes in these files are necessary to begin using mutt. When -your ready to make changes, the manpage for muttrc is a good starting +your ready to make changes, the man page for muttrc is a good starting place. diff --git a/content/databases/db/db-desc.xml b/content/databases/db/db-desc.xml index 24702284c8..812fbfa1b7 100644 --- a/content/databases/db/db-desc.xml +++ b/content/databases/db/db-desc.xml @@ -1,51 +1,63 @@ Contents -The db package contains db_archive, +The db package contains +db_archive, db_checkpoint, -db_deadlock, db_dump, -db_load, db_printlog, -db_recover, db_stat, -db_upgrade, db_verify and db -libraries +db_deadlock, +db_dump, +db_load, +db_printlog, +db_recover, +db_stat, +db_upgrade and +db_verify. + + Description db_archive -No description available +db_archive prints the pathnames of log files that are no longer +in use. + db_checkpoint -No description available +db_checkpoint is a daemon process used to monitor and checkpoint +database logs. db_deadlock -No description available +db_deadlock is used to abort lock requests when deadlocks are +detected. db_dump -No description available +db_dump converts database files to a flat file format readable +by db_load. db_load -No description available +db_load is used to create database files from flat files created +with db_dump. db_printlog -No description available +db_printlog converts database log files to human readable +text. + db_recover -No description available +db_recover is used to restore a database to a consistent state +after a failure. db_stat -No description available +db_stat displays database environment statistics. db_upgrade -No description available +db_upgrade is used to upgrade database files to a newer version +of Berkeley DB. db_verify -No description available - -db libraries -These are used by many other programs to perform db linked -functions. +db_verify is used to run consistency checks on database files. diff --git a/gnome/core/desktop/gnome-desktop-intro.xml b/gnome/core/desktop/gnome-desktop-intro.xml index 37ab3bf021..ca3ea63955 100644 --- a/gnome/core/desktop/gnome-desktop-intro.xml +++ b/gnome/core/desktop/gnome-desktop-intro.xml @@ -9,7 +9,7 @@ Estimated Disk space required: &gnome-desktop-buildsize; Estimated build time: &gnome-desktop-time; The gnome-desktop package contains GNOME's .desktop files, the -gnome-about program, manpages and GNOME's core graphics files and icons. +gnome-about program, man pages and GNOME's core graphics files and icons. gnome-desktop depends on: diff --git a/multimedia/audioutils/cdparanoia/CDParanoia-config.xml b/multimedia/audioutils/cdparanoia/CDParanoia-config.xml index 5bcc916321..6ca6377dd8 100644 --- a/multimedia/audioutils/cdparanoia/CDParanoia-config.xml +++ b/multimedia/audioutils/cdparanoia/CDParanoia-config.xml @@ -6,8 +6,6 @@ CDParanoia itself needs little configuration; information can be found from the man page. -For the libcdda library, the usual rules apply: - &library-config; diff --git a/multimedia/audioutils/mpg123/mpg123-intro.xml b/multimedia/audioutils/mpg123/mpg123-intro.xml index 2849420a71..bb7f4c0fff 100644 --- a/multimedia/audioutils/mpg123/mpg123-intro.xml +++ b/multimedia/audioutils/mpg123/mpg123-intro.xml @@ -10,7 +10,7 @@ Estimated Disk space required: &mpg123-buildsize; The mpg123 package contains a console-based mp3-player. It claims to be the fastest mp3-decoder for unix. -mpg123 depends on: with -oss-compatibility. +mpg123 depends on: + with oss-compatibility. diff --git a/multimedia/audioutils/xmms/XMMS-config.xml b/multimedia/audioutils/xmms/XMMS-config.xml index 3886fdaab5..7a23e5852f 100644 --- a/multimedia/audioutils/xmms/XMMS-config.xml +++ b/multimedia/audioutils/xmms/XMMS-config.xml @@ -9,7 +9,7 @@ When you start XMMS for the first time, you can configure it with CTRL+P Note that you can extend XMMS' functionality -with plugins and skins. You can find these at http://xmms.org. +with plugins and skins. You can find these at . diff --git a/multimedia/audioutils/xmms/XMMS-desc.xml b/multimedia/audioutils/xmms/XMMS-desc.xml index 76b7bc8c0e..d468261319 100644 --- a/multimedia/audioutils/xmms/XMMS-desc.xml +++ b/multimedia/audioutils/xmms/XMMS-desc.xml @@ -1,8 +1,7 @@ Contents -The xmms package contains xmms, xmms-config, gnomexmss, -wmxmms. +The xmms package contains xmms, xmms-config, gnomexmss and wmxmms. diff --git a/multimedia/audioutils/xmms/XMMS-intro.xml b/multimedia/audioutils/xmms/XMMS-intro.xml index e69999fb53..f3b7e145b1 100644 --- a/multimedia/audioutils/xmms/XMMS-intro.xml +++ b/multimedia/audioutils/xmms/XMMS-intro.xml @@ -11,6 +11,7 @@ Estimated Disk space required: &XMMS-buildsize; XMMS depends on: a working soundcard, , and -XMMS will utilize , , gnome-applets, libmikmod, , and if -installed prior to XMMS. +XMMS will utilize: +, , gnome-applets, libmikmod, +, and diff --git a/multimedia/cdwriteutils/kernel.xml b/multimedia/cdwriteutils/kernel.xml index 0b0ce249c4..9f5b171472 100644 --- a/multimedia/cdwriteutils/kernel.xml +++ b/multimedia/cdwriteutils/kernel.xml @@ -6,8 +6,7 @@ below for your CD-ROM interface type: SCSI CD-writer: - -SCSI support menu +SCSI support menu SCSI support: Y or M SCSI CD-ROM support: Y or M SCSI generic support: Y or M @@ -17,8 +16,7 @@ applicable. IDE CD-writer: - -ATA/IDE/MFM/RLL support menu +ATA/IDE/MFM/RLL support menu IDE/ATAPI CDROM support: N SCSI emulation support: Y or M SCSI support menu diff --git a/multimedia/libdriv/esound/esound-exp.xml b/multimedia/libdriv/esound/esound-exp.xml index 4598b5f07b..15659720b1 100644 --- a/multimedia/libdriv/esound/esound-exp.xml +++ b/multimedia/libdriv/esound/esound-exp.xml @@ -1,7 +1,7 @@ Command explanations ---sysconfdir=/etc : This command put +--sysconfdir=/etc : This command put esounds configuration files in /etc instead of /use/etc. diff --git a/multimedia/libdriv/libao.xml b/multimedia/libdriv/libao.xml index abd96e0818..423c5753d2 100644 --- a/multimedia/libdriv/libao.xml +++ b/multimedia/libdriv/libao.xml @@ -4,7 +4,6 @@ &libao-intro; &libao-inst; -&libao-exp; &libao-desc; diff --git a/multimedia/libdriv/libao/libao-inst.xml b/multimedia/libdriv/libao/libao-inst.xml index 7497eda5a2..d228c78f06 100644 --- a/multimedia/libdriv/libao/libao-inst.xml +++ b/multimedia/libdriv/libao/libao-inst.xml @@ -4,7 +4,7 @@ Install libao by running the following commands: ./configure --prefix=/usr && -make CC="gcc $CFLAGS" && +make && make install diff --git a/multimedia/libdriv/nas/nas-desc.xml b/multimedia/libdriv/nas/nas-desc.xml index ffdc1f60cc..1b6de012c5 100644 --- a/multimedia/libdriv/nas/nas-desc.xml +++ b/multimedia/libdriv/nas/nas-desc.xml @@ -1,8 +1,8 @@ Contents -The nas package contains nas utils, headers and -libraries. +The nas package contains nas utils, +headers and libraries. diff --git a/multimedia/libdriv/nas/nas-exp.xml b/multimedia/libdriv/nas/nas-exp.xml index 0119760874..ed78b22279 100644 --- a/multimedia/libdriv/nas/nas-exp.xml +++ b/multimedia/libdriv/nas/nas-exp.xml @@ -1,10 +1,10 @@ Command explanations -xmkmf...: Compile using the standard way +xmkmf... : Compile using the standard way for compiling X based apps. -make INCROOT=...: Install with /usr prefix +make INCROOT=... : Install with /usr prefix instead of the default /usr/X11R6. Also install man pages. diff --git a/multimedia/libdriv/nas/nas-intro.xml b/multimedia/libdriv/nas/nas-intro.xml index 9d9f12cd72..9db784192f 100644 --- a/multimedia/libdriv/nas/nas-intro.xml +++ b/multimedia/libdriv/nas/nas-intro.xml @@ -2,6 +2,7 @@ Introduction to nas Download location (HTTP): +Download location (FTP): Version used: &nas-version; Package size: &nas-size; Estimated Disk space required: &nas-buildsize; diff --git a/multimedia/libdriv/nas/nas.ent b/multimedia/libdriv/nas/nas.ent index 066ac03e1f..35f6b12b83 100644 --- a/multimedia/libdriv/nas/nas.ent +++ b/multimedia/libdriv/nas/nas.ent @@ -7,4 +7,5 @@ + diff --git a/multimedia/libdriv/sdl/SDL-desc.xml b/multimedia/libdriv/sdl/SDL-desc.xml index 09bb5b15f9..3037b75ccf 100644 --- a/multimedia/libdriv/sdl/SDL-desc.xml +++ b/multimedia/libdriv/sdl/SDL-desc.xml @@ -2,7 +2,7 @@ Contents The SDL package contains the Simple DirectMedia -Layer +Layer. diff --git a/multimedia/libdriv/sdl/SDL-intro.xml b/multimedia/libdriv/sdl/SDL-intro.xml index b3c2370299..e88a64e277 100644 --- a/multimedia/libdriv/sdl/SDL-intro.xml +++ b/multimedia/libdriv/sdl/SDL-intro.xml @@ -12,6 +12,7 @@ designed to make it easy to write multimedia software, such as games and emulators. SDL will utilize: -oss, , , , nas, nasm, , and directfb +oss, , , , nas, nasm, +, and directfb diff --git a/multimedia/videoutils/ffmpeg/ffmpeg-intro.xml b/multimedia/videoutils/ffmpeg/ffmpeg-intro.xml index 0e6fdf043f..046295a74b 100644 --- a/multimedia/videoutils/ffmpeg/ffmpeg-intro.xml +++ b/multimedia/videoutils/ffmpeg/ffmpeg-intro.xml @@ -12,6 +12,6 @@ Estimated build time &ffmpeg-time; video. Due to heavy development, not all of this functions will work. ffmpeg will utilize: -, , and Imlib2 +, and Imlib2 diff --git a/postlfs/security/pam/linux_pam-config.xml b/postlfs/security/pam/linux_pam-config.xml index 721c7d521a..0fda64f6e6 100644 --- a/postlfs/security/pam/linux_pam-config.xml +++ b/postlfs/security/pam/linux_pam-config.xml @@ -31,7 +31,7 @@ other password required pam_unix.so nullok # End /etc/pam.conf -The pam manpage provides a good starting point for descriptions of +The pam man page provides a good starting point for descriptions of fields and allowable entries. The Linux-PAM guide for system administrators and two PAM hints located at are also available for further reading. diff --git a/pst/printing/cups/cups-config.xml b/pst/printing/cups/cups-config.xml index fcb357ba2d..887cef2554 100644 --- a/pst/printing/cups/cups-config.xml +++ b/pst/printing/cups/cups-config.xml @@ -3,7 +3,7 @@ Configuration of CUPS is dependent on the type of printer and can be complex. Generally, postscript printers are easier. For detailed instructions on -configuration and use of CUPS, see . +configuration and use of CUPS, see . The Software Administrators Manual and Software Users Manual are particularly useful. diff --git a/pst/printing/cups/cups-exp.xml b/pst/printing/cups/cups-exp.xml index 81b5bebf65..0e7eda917b 100644 --- a/pst/printing/cups/cups-exp.xml +++ b/pst/printing/cups/cups-exp.xml @@ -2,6 +2,8 @@ Installation command explanations The basic default behavior of the installation is appropriate for LFS systems. -CUPS files are placed in /usr/bin, /usr/sbin, /var, and /etc/cups. +CUPS files are placed in /usr/bin, +/usr/sbin, /var and +/etc/cups. diff --git a/pst/printing/cups/cups-intro.xml b/pst/printing/cups/cups-intro.xml index f9dc326aaa..4a07353732 100644 --- a/pst/printing/cups/cups-intro.xml +++ b/pst/printing/cups/cups-intro.xml @@ -10,7 +10,7 @@ Estimated Disk space required: &cups-buildsize; CUPS depends on: (for non-postscript printers) CUPS will utilize: -, , and +, and The Common UNIX Printing System ("CUPS") is a print spooler and diff --git a/pst/printing/gs/gs-exp.xml b/pst/printing/gs/gs-exp.xml index 616cc1bf2e..043e9f57c0 100644 --- a/pst/printing/gs/gs-exp.xml +++ b/pst/printing/gs/gs-exp.xml @@ -1,11 +1,11 @@ Installation command explanations ---libexecdir=/usr/lib/gs : executable +--libexecdir=/usr/lib/gs : executable libraries of Ghostscript will be installed to /usr/lib/gs. ---sysconfdir=/etc/gs : Configuration data +--sysconfdir=/etc/gs : Configuration data goes to /etc/gs instead of /usr/etc. diff --git a/pst/printing/lprng/lprng-desc.xml b/pst/printing/lprng/lprng-desc.xml index 1d7df8d6ee..889c62af73 100644 --- a/pst/printing/lprng/lprng-desc.xml +++ b/pst/printing/lprng/lprng-desc.xml @@ -4,7 +4,7 @@ The LPRng package contains lp, lpq, lpr, lprm, lpstat, -lpc and lpd +lpc and lpd. diff --git a/pst/printing/printing.xml b/pst/printing/printing.xml index 6808366456..1a16987a78 100644 --- a/pst/printing/printing.xml +++ b/pst/printing/printing.xml @@ -2,7 +2,6 @@ Printing -Table of Contents ∪︀ &gs; &espgs; diff --git a/pst/scanning/sane/sane-desc.xml b/pst/scanning/sane/sane-desc.xml index d0e6e4c202..e11b188f5a 100644 --- a/pst/scanning/sane/sane-desc.xml +++ b/pst/scanning/sane/sane-desc.xml @@ -7,11 +7,11 @@ for a list of available backends. Frontends: -scanimage : Command line interface for +scanimage : Command line interface for scanning. -xscanimage : Graphical user interface for +xscanimage : Graphical user interface for scanning. -gimp-plugin : xscanimage as Gimp-plugin. +gimp-plugin : xscanimage as Gimp-plugin. diff --git a/pst/scanning/sane/sane-exp.xml b/pst/scanning/sane/sane-exp.xml index b560683b78..8a30286d83 100644 --- a/pst/scanning/sane/sane-exp.xml +++ b/pst/scanning/sane/sane-exp.xml @@ -1,7 +1,7 @@ Installation command explanations ---prefix=/usr : All software is going to +--prefix=/usr : All software is going to be installed in directories relative to/usr. diff --git a/pst/scanning/xsane/xsane-exp.xml b/pst/scanning/xsane/xsane-exp.xml index b560683b78..8a30286d83 100644 --- a/pst/scanning/xsane/xsane-exp.xml +++ b/pst/scanning/xsane/xsane-exp.xml @@ -1,7 +1,7 @@ Installation command explanations ---prefix=/usr : All software is going to +--prefix=/usr : All software is going to be installed in directories relative to/usr.