Whitespace-only changes. Translators, please ignore.
This commit is contained in:
Warren Block
parent
6c93ae10eb
commit
1d74b03f8e
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=42200
1 changed files with 43 additions and 45 deletions
|
|
@ -463,8 +463,8 @@
|
|||
<title>Block Quotations</title>
|
||||
|
||||
<para>A block quotation is an extended quotation from another
|
||||
document that should not appear within the current
|
||||
paragraph. These are rarely needed.</para>
|
||||
document that should not appear within the current paragraph.
|
||||
These are rarely needed.</para>
|
||||
|
||||
<para>Blockquotes can optionally contain a title and an
|
||||
attribution (or they can be left untitled and
|
||||
|
|
@ -740,11 +740,11 @@ main(void)
|
|||
piece of text or specific position within an
|
||||
example.</para>
|
||||
|
||||
<para>Callouts are marked with the
|
||||
<sgmltag>co</sgmltag> element. Each element must have a
|
||||
unique <literal>id</literal> assigned to it. After the
|
||||
example, include a <sgmltag>calloutlist</sgmltag> that describes
|
||||
each callout.</para>
|
||||
<para>Callouts are marked with the <sgmltag>co</sgmltag>
|
||||
element. Each element must have a unique
|
||||
<literal>id</literal> assigned to it. After the example,
|
||||
include a <sgmltag>calloutlist</sgmltag> that describes each
|
||||
callout.</para>
|
||||
|
||||
<example>
|
||||
<title><sgmltag>co</sgmltag> and
|
||||
|
|
@ -896,7 +896,8 @@ main(void)
|
|||
<para>Table borders can be suppressed by setting the
|
||||
<literal>frame</literal> attribute to <literal>none</literal>
|
||||
in the <sgmltag>informaltable</sgmltag> element. For example,
|
||||
<literal><sgmltag class="starttag">informaltable frame="none"</sgmltag></literal>.</para>
|
||||
<literal><sgmltag class="starttag">informaltable
|
||||
frame="none"</sgmltag></literal>.</para>
|
||||
|
||||
<example>
|
||||
<title>Tables Where <literal>frame="none"</literal></title>
|
||||
|
|
@ -1225,8 +1226,7 @@ This is the file called 'foo2'</screen>
|
|||
<acronym>HTML</acronym>, appear visually better.</para>
|
||||
|
||||
<para>This can be confusing, and sometimes the choice is not
|
||||
always clear. Hopefully this example makes it
|
||||
clearer.</para>
|
||||
always clear. Hopefully this example makes it clearer.</para>
|
||||
|
||||
<example>
|
||||
<title>Applications, Commands, and Options</title>
|
||||
|
|
@ -1587,9 +1587,8 @@ This is the file called 'foo2'</screen>
|
|||
</note>
|
||||
|
||||
<para>Two elements exist to describe parts of
|
||||
<filename>Makefile</filename>s,
|
||||
<sgmltag>maketarget</sgmltag> and
|
||||
<sgmltag>makevar</sgmltag>.</para>
|
||||
<filename>Makefile</filename>s, <sgmltag>maketarget</sgmltag>
|
||||
and <sgmltag>makevar</sgmltag>.</para>
|
||||
|
||||
<para><sgmltag>maketarget</sgmltag> identifies a build target
|
||||
exported by a <filename>Makefile</filename> that can be
|
||||
|
|
@ -1703,11 +1702,10 @@ This is the file called 'foo2'</screen>
|
|||
|
||||
<para><sgmltag>replaceable</sgmltag> can be used in many
|
||||
different elements, including <sgmltag>literal</sgmltag>.
|
||||
This example also shows that
|
||||
<sgmltag>replaceable</sgmltag> should only be wrapped
|
||||
around the content that the user <emphasis>is</emphasis>
|
||||
meant to provide. The other content should be left
|
||||
alone.</para>
|
||||
This example also shows that <sgmltag>replaceable</sgmltag>
|
||||
should only be wrapped around the content that the user
|
||||
<emphasis>is</emphasis> meant to provide. The other content
|
||||
should be left alone.</para>
|
||||
|
||||
<para>Usage:</para>
|
||||
|
||||
|
|
@ -1746,7 +1744,6 @@ This is the file called 'foo2'</screen>
|
|||
|
||||
<programlisting><sgmltag class="starttag">screen</sgmltag><sgmltag class="starttag">errorname</sgmltag>Panic: cannot mount root<sgmltag class="endtag">errorname</sgmltag><sgmltag class="endtag">screen</sgmltag></programlisting>
|
||||
|
||||
|
||||
<para>Appearance:</para>
|
||||
|
||||
<informalexample>
|
||||
|
|
@ -1761,13 +1758,13 @@ This is the file called 'foo2'</screen>
|
|||
|
||||
<important>
|
||||
<para>Image support in the documentation is somewhat
|
||||
experimental. The mechanisms described here are
|
||||
unlikely to change, but that is not guaranteed.</para>
|
||||
experimental. The mechanisms described here are unlikely to
|
||||
change, but that is not guaranteed.</para>
|
||||
|
||||
<para>To provide conversion between different image formats, the
|
||||
<filename role="package">graphics/ImageMagick</filename>
|
||||
port must be installed. This port is not included in
|
||||
the <filename role="package">textproc/docproj</filename> meta
|
||||
port must be installed. This port is not included in the
|
||||
<filename role="package">textproc/docproj</filename> meta
|
||||
port, and must be installed separately.</para>
|
||||
|
||||
<para>A good example of the use of images is the
|
||||
|
|
@ -1800,28 +1797,27 @@ This is the file called 'foo2'</screen>
|
|||
repository.</para>
|
||||
|
||||
<para>Use the appropriate format for each image. Documentation
|
||||
will often have a mix of
|
||||
<acronym>EPS</acronym> and <acronym>PNG</acronym> images. The
|
||||
will often have a mix of <acronym>EPS</acronym> and
|
||||
<acronym>PNG</acronym> images. The
|
||||
<filename>Makefile</filename>s ensure that the correct format
|
||||
image is chosen depending on the output format used.
|
||||
<emphasis>Do not commit the same
|
||||
image to the repository in two different
|
||||
formats</emphasis>.</para>
|
||||
<emphasis>Do not commit the same image to the repository in
|
||||
two different formats</emphasis>.</para>
|
||||
|
||||
<important>
|
||||
<para>The Documentation Project may eventually
|
||||
switch to using the <acronym>SVG</acronym> (Scalable Vector
|
||||
Graphic) format for vector images. However, the current
|
||||
state of <acronym>SVG</acronym> capable editing tools makes
|
||||
this impractical.</para>
|
||||
<para>The Documentation Project may eventually switch to using
|
||||
the <acronym>SVG</acronym> (Scalable Vector Graphic) format
|
||||
for vector images. However, the current state of
|
||||
<acronym>SVG</acronym> capable editing tools makes this
|
||||
impractical.</para>
|
||||
</important>
|
||||
</sect2>
|
||||
|
||||
<sect2 id="docbook-markup-image-file-locations">
|
||||
<title>Image File Locations</title>
|
||||
|
||||
<para>Image files can be stored in one of several
|
||||
locations, depending on the document and image:</para>
|
||||
<para>Image files can be stored in one of several locations,
|
||||
depending on the document and image:</para>
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
|
|
@ -1859,14 +1855,15 @@ This is the file called 'foo2'</screen>
|
|||
<sect2 id="docbook-markup-image-markup">
|
||||
<title>Image Markup</title>
|
||||
|
||||
<para>Images are included as part of a <sgmltag>mediaobject</sgmltag>. The
|
||||
<para>Images are included as part of a
|
||||
<sgmltag>mediaobject</sgmltag>. The
|
||||
<sgmltag>mediaobject</sgmltag> can contain other, more
|
||||
specific objects. We are concerned with two, the
|
||||
<sgmltag>imageobject</sgmltag> and the
|
||||
<sgmltag>textobject</sgmltag>.</para>
|
||||
|
||||
<para>Include one <sgmltag>imageobject</sgmltag>,
|
||||
and two <sgmltag>textobject</sgmltag> elements. The
|
||||
<para>Include one <sgmltag>imageobject</sgmltag>, and two
|
||||
<sgmltag>textobject</sgmltag> elements. The
|
||||
<sgmltag>imageobject</sgmltag> will point to the name of the
|
||||
image file without the extension. The
|
||||
<sgmltag>textobject</sgmltag> elements contain information
|
||||
|
|
@ -1882,8 +1879,8 @@ This is the file called 'foo2'</screen>
|
|||
elements are shown instead of the graphical ones.</para>
|
||||
|
||||
<para>This example shows how to include an image called
|
||||
<filename>fig1.png</filename> in a document. The image is a rectangle
|
||||
with an A inside it:</para>
|
||||
<filename>fig1.png</filename> in a document. The image is a
|
||||
rectangle with an A inside it:</para>
|
||||
|
||||
<programlisting><sgmltag class="starttag">mediaobject</sgmltag>
|
||||
<sgmltag class="starttag">imageobject</sgmltag>
|
||||
|
|
@ -1961,10 +1958,10 @@ IMAGES+= fig2.png
|
|||
IMAGES+= fig3.png
|
||||
…</programlisting>
|
||||
|
||||
<para>Again, the <filename>Makefile</filename> will work out
|
||||
the complete list of images it needs to build the source
|
||||
document, you only need to list the image files
|
||||
<emphasis>you</emphasis> provided.</para>
|
||||
<para>Again, the <filename>Makefile</filename> will work out the
|
||||
complete list of images it needs to build the source document,
|
||||
you only need to list the image files <emphasis>you</emphasis>
|
||||
provided.</para>
|
||||
</sect2>
|
||||
|
||||
<sect2 id="docbook-markup-images-in-subdirectories">
|
||||
|
|
@ -2182,7 +2179,8 @@ IMAGES= chapter1/fig1.png
|
|||
<emphasis>sample introduction</emphasis>.</para>
|
||||
|
||||
<para>More specific information can be found in the
|
||||
<emphasis>sample introduction with more details</emphasis> section.</para>
|
||||
<emphasis>sample introduction with more
|
||||
details</emphasis> section.</para>
|
||||
</blockquote>
|
||||
</example>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue