Changeset 161767fb


Ignore:
Timestamp:
12/01/2014 01:42:53 PM (7 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
10c17a3
Parents:
421128a1
Message:

Actualise template for "Kernel Configuration" style + minor changes
according to what has been discussed on the list(s) in the last months
(ordering of deps)

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15102 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • template/template.xml

    r421128a1 r161767fb  
    9797    <bridgehead renderas="sect4">Required</bridgehead>
    9898    <para role="required">
    99       <xref linkend="BLFS DEPENDENCY"/> <!-- notice no period as this is not a sentence
    100       If there are more than two, they must be separated by commas with the last
    101       member having "and" in front of it. The use of a serial comma is preferred
    102       (a comma after the next to last member before the "and"). -->
     99      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
     100      a sentence. If there are more than two, they must be separated by commas
     101      with the last member having "and" in front of it. The use of a serial
     102      comma is preferred (a comma after the next to last member before the
     103      "and"). BLFS_DEPENDENCY should be an "id" attribute defined somewhere
     104      in the book (usually in a <sect1>). -->
    103105    </para>
    104106
     
    106108    <bridgehead renderas="sect4">Recommended</bridgehead>
    107109    <para role="recommended">
    108       <ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink> and
    109       <xref linkend="BLFS DEPENDENCY"/> <!-- notice no period as this is not a sentence-->
     110      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
     111      a sentence. See above for the use of "and" and commas. Normally, neither
     112      required nor recommended dependencies should be <ulink>. -->
    110113    </para>
    111114
     
    113116    <bridgehead renderas="sect4">Optional</bridgehead>
    114117    <para role="optional">
     118      <xref linkend="BLFS_DEPENDENCY"/> and
    115119      <ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>
    116       <!-- notice no period as this is not a sentence-->
     120      <!-- notice no period as this is not a sentence. See above for the use
     121      of commas and "and". The order should <xref> before <ulink>.-->
    117122    </para>
    118123
     
    135140<screen><literal>Master section ---&gt;
    136141  Subsection ---&gt;
    137     [*] Required option                          [CONFIG_REQU_OPT]
    138     <*> Required option (could be a module)      [CONFIG_REQU_OPT_MOD]
    139     [ ] Incompatible option                      [CONFIG_INCOMP_OPT]
    140     < > Incompatible option (even as module)     [CONFIG_INCOMP_OPT_MOD]</literal></screen>
     142    [*]     Required parameter                     [CONFIG_REQU_PAR]
     143    &lt;*&gt;     Required parameter (not as module)     [CONFIG_REQU_PAR_NMOD]
     144    &lt;*/M&gt;   Required parameter (could be a module) [CONFIG_REQU_PAR_MOD]
     145    &lt;*/M/ &gt; Optional parameter                     [CONFIG_OPT_PAR]
     146    [ ] Incompatible parameter                     [CONFIG_INCOMP_PAR]
     147    &lt; &gt; Incompatible parameter (even as module)    [CONFIG_INCOMP_PAR_MOD]</literal></screen>
    141148
    142149    <para>
Note: See TracChangeset for help on using the changeset viewer.