Changeset f698055a


Ignore:
Timestamp:
Jun 24, 2014, 11:45:38 AM (8 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
4c2f1e7
Parents:
abf6b95
Message:

Improve consistency in package installation lists, mainly removing 'and'

Location:
BOOK/final-system/common
Files:
39 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/attr.xml

    rabf6b95 rf698055a  
    7272        <seg>attr, getfattr, setfattr</seg>
    7373        <seg>libattr.[a,so]</seg>
    74         <seg>/usr/include/attr /usr/share/doc/attr-&attr-version;</seg>
     74        <seg>/usr/include/attr, /usr/share/doc/attr-&attr-version;</seg>
    7575      </seglistitem>
    7676    </segmentedlist>
  • BOOK/final-system/common/autoconf.xml

    rabf6b95 rf698055a  
    5757      <seglistitem>
    5858        <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
    59         and ifnames</seg>
     59        ifnames</seg>
    6060        <seg>/usr/share/autoconf</seg>
    6161      </seglistitem>
  • BOOK/final-system/common/automake.xml

    rabf6b95 rf698055a  
    5555        automake-&automake-version2;, compile, config.guess, config.sub,
    5656        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
    57         py-compile, symlink-tree, and ylwrap</seg>
     57        py-compile, symlink-tree, ylwrap</seg>
    5858        <seg>/usr/share/aclocal-&automake-version2;,
    5959        /usr/share/automake-&automake-version2;, /usr/share/doc/automake</seg>
  • BOOK/final-system/common/bash.xml

    rabf6b95 rf698055a  
    8383
    8484      <seglistitem>
    85         <seg>bash, bashbug, and sh (link to bash)</seg>
     85        <seg>bash, bashbug, sh (link to bash)</seg>
    8686        <seg>/usr/share/doc/bash-&bash-version;</seg>
    8787      </seglistitem>
  • BOOK/final-system/common/bc.xml

    rabf6b95 rf698055a  
    5151
    5252      <seglistitem>
    53         <seg>bc and dc</seg>
     53        <seg>bc, dc</seg>
    5454      </seglistitem>
    5555    </segmentedlist>
  • BOOK/final-system/common/binutils.xml

    rabf6b95 rf698055a  
    113113
    114114      <seglistitem>
    115         <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy,
    116         objdump,
    117         ranlib, readelf, size, strings, and strip</seg>
    118         <seg>libbfd.[a,so], and libopcodes.[a,so]</seg>
     115        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
     116        objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
     117        <seg>libbfd.[a,so], libopcodes.[a,so]</seg>
    119118        <seg>/usr/lib/ldscripts</seg>
    120119      </seglistitem>
  • BOOK/final-system/common/bison.xml

    rabf6b95 rf698055a  
    5252
    5353      <seglistitem>
    54         <seg>bison and yacc</seg>
     54        <seg>bison, yacc</seg>
    5555        <seg>liby.a</seg>
    5656        <seg>/usr/share/bison</seg>
  • BOOK/final-system/common/bzip2.xml

    rabf6b95 rf698055a  
    8383        <seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp (link to
    8484        bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
    85         bzgrep, bzip2, bzip2recover, bzless (link to bzmore), and bzmore</seg>
     85        bzgrep, bzip2, bzip2recover, bzless (link to bzmore), bzmore</seg>
    8686        <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
    87         libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg>
     87        libbz2.so.&bzip2-version;), libbz2.so.&bzip2-version;</seg>
    8888      </seglistitem>
    8989    </segmentedlist>
  • BOOK/final-system/common/coreutils.xml

    rabf6b95 rf698055a  
    116116        sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
    117117        sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
    118         tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg>
     118        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes</seg>
    119119        <seg>libstdbuf.so</seg>
    120120        <seg>/usr/lib/coreutils</seg>
  • BOOK/final-system/common/diffutils.xml

    rabf6b95 rf698055a  
    6060
    6161      <seglistitem>
    62         <seg>cmp, diff, diff3, and sdiff</seg>
     62        <seg>cmp, diff, diff3, sdiff</seg>
    6363      </seglistitem>
    6464    </segmentedlist>
  • BOOK/final-system/common/e2fsprogs.xml

    rabf6b95 rf698055a  
    112112        fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
    113113        mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
    114         mklost+found, resize2fs, and tune2fs</seg>
     114        mklost+found, resize2fs, tune2fs</seg>
    115115        <seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so],
    116         libss.[a,so], and libquota.a</seg>
     116        libss.[a,so], libquota.a</seg>
    117117        <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
    118118        /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
  • BOOK/final-system/common/findutils.xml

    rabf6b95 rf698055a  
    6969
    7070      <seglistitem>
    71         <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
     71        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, xargs</seg>
    7272        <seg>/usr/lib/locate</seg>
    7373      </seglistitem>
  • BOOK/final-system/common/flex.xml

    rabf6b95 rf698055a  
    7474
    7575      <seglistitem>
    76         <seg>flex, flex++ (link to flex), and lex</seg>
    77         <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
     76        <seg>flex, flex++ (link to flex), lex</seg>
     77        <seg>libfl.[a,so], libfl_pic.[a,so]</seg>
    7878        <seg>/usr/share/doc/flex-&flex-version;</seg>
    7979      </seglistitem>
  • BOOK/final-system/common/gawk.xml

    rabf6b95 rf698055a  
    5858      <seglistitem>
    5959        <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
    60         pgawk, pgawk-&gawk-version;, and pwcat</seg>
     60        pgawk, pgawk-&gawk-version;, pwcat</seg>
    6161        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
    6262        /usr/share/doc/gawk-&gawk-version;</seg>
  • BOOK/final-system/common/gcc.xml

    rabf6b95 rf698055a  
    134134
    135135      <seglistitem>
    136         <seg>c++, cc (link to gcc), cpp, g++, gcc, and gcov</seg>
     136        <seg>c++, cc (link to gcc), cpp, g++, gcc, gcov</seg>
    137137        <seg>libasan.[a,so], libatomic.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
    138138        libgomp.[a,so], libiberty.a, libitm.[a,so], liblto_plugin.so, libmudflap.[a,so], libmudflapth.[a,so],
    139         libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and
     139        libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a,
    140140        libtsan.[a,so]</seg>
    141141        <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
  • BOOK/final-system/common/gdbm.xml

    rabf6b95 rf698055a  
    6868      <seglistitem>
    6969        <seg>gdbm_dump, gdbm_load, gdbmtool</seg>
    70         <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
     70        <seg>libgdbm.{a,so}, libgdbm_compat.{a,so}</seg>
    7171      </seglistitem>
    7272    </segmentedlist>
  • BOOK/final-system/common/gettext.xml

    rabf6b95 rf698055a  
    5858        gettext.sh, gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm,
    5959        msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge,
    60         msgunfmt, msguniq, ngettext, recode-sr-latin, and xgettext</seg>
     60        msgunfmt, msguniq, ngettext, recode-sr-latin, xgettext</seg>
    6161        <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
    62         libgettextsrc.so, and preloadable_libintl.so</seg>
     62        libgettextsrc.so, preloadable_libintl.so</seg>
    6363        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
    6464        /usr/share/gettext</seg>
  • BOOK/final-system/common/glibc.xml

    rabf6b95 rf698055a  
    393393        ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
    394394        pcprofiledump, pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
    395         zdump, and zic</seg>
     395        zdump, zic</seg>
    396396        <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
    397397        libc.[a,so], libc_nonshared.a, libcidn.[a,so], libcrypt.[a,so],
     
    400400        libnss_files.so, libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
    401401        libpcprofile.so, libpthread.[a,so], libpthread_nonshared.a,
    402         libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so, and
     402        libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so,
    403403        libutil.[a,so]</seg>
    404404        <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
     
    409409        /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
    410410        /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/glibc, /usr/lib/locale,
    411         /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig, and
     411        /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig,
    412412        /var/cache/nscd</seg>
    413413      </seglistitem>
  • BOOK/final-system/common/grep.xml

    rabf6b95 rf698055a  
    5151
    5252      <seglistitem>
    53         <seg>egrep, fgrep, and grep</seg>
     53        <seg>egrep, fgrep, grep</seg>
    5454      </seglistitem>
    5555    </segmentedlist>
  • BOOK/final-system/common/groff.xml

    rabf6b95 rf698055a  
    6060        pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, preconv, refer,
    6161        roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim,
    62         tbl, tfmtodit, and troff</seg>
     62        tbl, tfmtodit, troff</seg>
    6363        <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;, /usr/share/groff</seg>
    6464      </seglistitem>
  • BOOK/final-system/common/gzip.xml

    rabf6b95 rf698055a  
    5757      <seglistitem>
    5858        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
    59         zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
     59        zegrep, zfgrep, zforce, zgrep, zless, zmore, znew</seg>
    6060      </seglistitem>
    6161    </segmentedlist>
  • BOOK/final-system/common/iana-etc.xml

    rabf6b95 rf698055a  
    5151
    5252      <seglistitem>
    53         <seg>/etc/protocols and /etc/services</seg>
     53        <seg>/etc/protocols, /etc/services</seg>
    5454      </seglistitem>
    5555    </segmentedlist>
  • BOOK/final-system/common/iproute2.xml

    rabf6b95 rf698055a  
    6060        <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
    6161        nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
    62         and tc</seg>
     62        tc</seg>
    6363        <seg>/etc/iproute2, /usr/lib/tc,
    6464        /usr/share/doc/iproute2-&iproute2-version;</seg>
  • BOOK/final-system/common/iputils.xml

    rabf6b95 rf698055a  
    5656
    5757      <seglistitem>
    58         <seg>clockdiff, ping, rdisc, tracepath, tracepath6, and traceroute6</seg>
     58        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6</seg>
    5959      </seglistitem>
    6060    </segmentedlist>
  • BOOK/final-system/common/kbd.xml

    rabf6b95 rf698055a  
    6969        (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
    7070        setleds, setmetamode, setvtrgb, showconsolefont, showkey,
    71         unicode_start, and unicode_stop</seg>
     71        unicode_start, unicode_stop</seg>
    7272        <seg>/usr/share/consolefonts, /usr/share/consoletrans,
    7373        /usr/share/doc/kbd-&kbd-version;,
  • BOOK/final-system/common/kmod.xml

    rabf6b95 rf698055a  
    8484        <seg>depmod (link to kmod), insmod (link to kmod), kmod,
    8585        lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
    86         and rmmod (link to kmod) </seg>
     86        rmmod (link to kmod) </seg>
    8787      </seglistitem>
    8888    </segmentedlist>
  • BOOK/final-system/common/less.xml

    rabf6b95 rf698055a  
    6666
    6767      <seglistitem>
    68         <seg>less, lessecho, and lesskey</seg>
     68        <seg>less, lessecho, lesskey</seg>
    6969      </seglistitem>
    7070    </segmentedlist>
  • BOOK/final-system/common/libtool.xml

    rabf6b95 rf698055a  
    5454
    5555      <seglistitem>
    56         <seg>libtool and libtoolize</seg>
     56        <seg>libtool, libtoolize</seg>
    5757        <seg>libltdl.[a,so]</seg>
    5858        <seg>/usr/include/libltdl, /usr/share/libtool</seg>
  • BOOK/final-system/common/ncurses.xml

    rabf6b95 rf698055a  
    8787      <seglistitem>
    8888        <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
    89         ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset</seg>
     89        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
    9090        <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
    91         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
     91        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
    9292        libpanelw.[a,so]</seg>
    9393        <seg>/usr/share/tabset, /usr/share/terminfo</seg>
  • BOOK/final-system/common/perl.xml

    rabf6b95 rf698055a  
    127127        pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, prove,
    128128        psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, ptargrep,
    129         s2p, shasum, splain, xsubpp, and zipdetails</seg>
     129        s2p, shasum, splain, xsubpp, zipdetails</seg>
    130130        <seg>Several hundred which cannot all be listed here</seg>
    131131        <seg>/usr/lib/perl5</seg>
  • BOOK/final-system/common/procps-ng.xml

    rabf6b95 rf698055a  
    8282      <seglistitem>
    8383        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
    84         top, uptime, vmstat, w, and watch</seg>
     84        top, uptime, vmstat, w, watch</seg>
    8585        <seg>libprocps.{a,so}</seg>
    8686        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
  • BOOK/final-system/common/psmisc.xml

    rabf6b95 rf698055a  
    4949
    5050      <seglistitem>
    51         <seg>fuser, killall, peekfd, prtstat, pstree, and pstree.x11
     51        <seg>fuser, killall, peekfd, prtstat, pstree, pstree.x11
    5252        (link to pstree)</seg>
    5353      </seglistitem>
  • BOOK/final-system/common/readline.xml

    rabf6b95 rf698055a  
    6666
    6767      <seglistitem>
    68         <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
     68        <seg>libhistory.[a,so], libreadline.[a,so]</seg>
    6969        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
    7070      </seglistitem>
  • BOOK/final-system/common/shadow.xml

    rabf6b95 rf698055a  
    156156        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
    157157        pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
    158         vigr (link to vipw), and vipw</seg>
     158        vigr (link to vipw), vipw</seg>
    159159        <seg>/etc/default</seg>
    160160      </seglistitem>
  • BOOK/final-system/common/tar.xml

    rabf6b95 rf698055a  
    6565
    6666      <seglistitem>
    67         <seg>rmt and tar</seg>
     67        <seg>rmt, tar</seg>
    6868        <seg>/usr/share/doc/tar-&tar-version;</seg>
    6969      </seglistitem>
  • BOOK/final-system/common/texinfo.xml

    rabf6b95 rf698055a  
    6868      <seglistitem>
    6969        <seg>info, infokey, install-info, makeinfo (link to texi2any),
    70         pdftexi2dvi, texi2dvi, texi2pdf, and texindex</seg>
     70        pdftexi2dvi, texi2dvi, texi2pdf, texindex</seg>
    7171        <seg>/usr/share/texinfo</seg>
    7272      </seglistitem>
  • BOOK/final-system/common/util-linux.xml

    rabf6b95 rf698055a  
    101101        scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
    102102        swapoff, swapon, switch_root, tailf, taskset, ul, umount, unshare,
    103         utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and write</seg>
    104         <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
     103        utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, write</seg>
     104        <seg>libblkid.[a,so], libmount.[a,so], libuuid.[a,so]</seg>
    105105        <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
    106106        /usr/share/bash-completion,
  • BOOK/final-system/common/vim.xml

    rabf6b95 rf698055a  
    162162        pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
    163163        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
    164         vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
     164        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
    165165        <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
    166166      </seglistitem>
  • BOOK/final-system/common/xz.xml

    rabf6b95 rf698055a  
    7272        xz), xz, xzcat (link to xz), xzcmp (link to xzdiff), xzdec, xzdiff,
    7373        xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
    74         and xzmore</seg>
     74        xzmore</seg>
    7575        <seg>liblzma.[a,so]</seg>
    7676        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
Note: See TracChangeset for help on using the changeset viewer.