[Lsb-messages] /var/www/bzr/lsb/devel/fhs-spec r60: some markup fixes - no content change (bug 1273)
Mats Wichmann
mats at linuxfoundation.org
Sat Mar 28 15:02:09 UTC 2015
------------------------------------------------------------
revno: 60
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: fhs-spec
timestamp: Sat 2015-03-28 09:02:09 -0600
message:
some markup fixes - no content change (bug 1273)
modified:
intro.xml
root-filesystem.xml
usr.xml
-------------- next part --------------
=== modified file 'intro.xml'
--- a/intro.xml 2011-05-06 13:56:04 +0000
+++ b/intro.xml 2015-03-28 15:02:09 +0000
@@ -65,22 +65,22 @@
and directories are displayed in a constant-width font.</para>
<para>Components of filenames that vary are represented by a description
-of the contents enclosed in "<emphasis remap='CW'><</emphasis>" and
-"<emphasis remap='CW'>></emphasis>" characters, <emphasis
-remap='CW'><thus></emphasis>. Electronic mail addresses are also
+of the contents enclosed in "<replaceable><</replaceable>" and
+"<replaceable>></replaceable>" characters,
+<replaceable><thus></replaceable>. Electronic mail addresses are also
enclosed in "<" and ">" but are shown in the usual
typeface.</para>
<para>Optional components of filenames are enclosed in
-"<emphasis>[</emphasis>" and "<emphasis>]</emphasis>" characters and may
-be combined with the "<emphasis><</emphasis>" and
-"<emphasis>></emphasis>" convention. For example, if a filename is
+"<replaceable>[</replaceable>" and "<replaceable>]</replaceable>" characters and may
+be combined with the "<replaceable><</replaceable>" and
+"<replaceable>></replaceable>" convention. For example, if a filename is
allowed to occur either with or without an extension, it might be
represented by
-<emphasis><filename>[.<extension>]</emphasis>.</para>
+<replaceable><filename>[.<extension>]</replaceable>.</para>
<para>Variable substrings of directory names and filenames are indicated
-by "<emphasis>*</emphasis>".</para>
+by "<replaceable>*</replaceable>".</para>
<para>The sections of the text marked as
<emphasis>Rationale</emphasis> are explanatory and are
=== modified file 'root-filesystem.xml'
--- a/root-filesystem.xml 2015-03-27 21:17:29 +0000
+++ b/root-filesystem.xml 2015-03-28 15:02:09 +0000
@@ -229,7 +229,7 @@
</row>
<row>
- <entry><filename>lib<qual></filename></entry>
+ <entry><filename>lib<replaceable><qual></replaceable></filename></entry>
<entry>Alternate format essential shared libraries (optional)</entry>
</row>
@@ -1166,7 +1166,7 @@
</section>
<section id='libltqualgtAlternateFormatEssential'>
-<title>/lib<qual> : Alternate format essential shared libraries (optional)</title>
+<title>/lib<replaceable><qual></replaceable> : Alternate format essential shared libraries (optional)</title>
<section id='purpose12'><title>Purpose</title>
@@ -1191,14 +1191,14 @@
<para>If one or more of these directories exist, the requirements for
their contents are the same as the normal <filename>/lib</filename>
-directory, except that <filename>/lib<qual>/cpp</filename> is
+directory, except that <filename>/lib<replaceable><qual></replaceable>/cpp</filename> is
not required.
<footnote>
<para>
-<filename>/lib<qual>/cpp</filename> is still permitted: this
+<filename>/lib<replaceable><qual></replaceable>/cpp</filename> is still permitted: this
allows the case where <filename>/lib</filename> and
-<filename>/lib<qual></filename> are the same (one is a symbolic
+<filename>/lib<replaceable><qual></replaceable></filename> are the same (one is a symbolic
link to the other). </para> </footnote></para>
</section>
=== modified file 'usr.xml'
--- a/usr.xml 2015-03-27 16:03:04 +0000
+++ b/usr.xml 2015-03-28 15:02:09 +0000
@@ -91,7 +91,7 @@
</row>
<row>
- <entry><filename>lib<qual></filename></entry>
+ <entry><filename>lib<replaceable><qual></replaceable></filename></entry>
<entry>Alternate Format Libraries (optional)</entry>
</row>
@@ -335,17 +335,17 @@
</section>
<section id='usrlibltqualgtAlternateFormatLibrari'>
-<title>/usr/lib<qual> : Alternate format libraries (optional)</title>
+<title>/usr/lib<replaceable><qual></replaceable> : Alternate format libraries (optional)</title>
<section id='purpose23'><title>Purpose</title>
-<para><filename>/usr/lib<qual></filename> performs the same role as <filename>/usr/lib</filename> for an
+<para><filename>/usr/lib<replaceable><qual></replaceable></filename> performs the same role as <filename>/usr/lib</filename> for an
alternate binary format, except that the symbolic links
-<filename>/usr/lib<qual>/sendmail</filename> and <filename>/usr/lib<qual>/X11</filename> are not required.
+<filename>/usr/lib<replaceable><qual></replaceable>/sendmail</filename> and <filename>/usr/lib<replaceable><qual></replaceable>/X11</filename> are not required.
<footnote>
<para>
-The case where <filename>/usr/lib</filename> and <filename>/usr/lib<qual></filename> are the
+The case where <filename>/usr/lib</filename> and <filename>/usr/lib<replaceable><qual></replaceable></filename> are the
same (one is a symbolic link to the other) these files and the
per-application subdirectories will exist.
</para>
@@ -464,8 +464,8 @@
<section id='specificOptions14'><title>Specific Options</title>
-<para>If directories <filename>/lib<qual></filename> or
-<filename>/usr/lib<qual></filename> exist, the equivalent
+<para>If directories <filename>/lib<replaceable><qual></replaceable></filename> or
+<filename>/usr/lib<replaceable><qual></replaceable></filename> exist, the equivalent
directories must also exist in <filename>/usr/local</filename>.</para>
<para><filename>/usr/local/etc</filename> may be a symbolic link to
More information about the lsb-messages
mailing list