example-tutorial Makefile, 1.15, 1.16 example-tutorial-en.xml, 1.15, 1.16 rpm-info.xml, 1.1, 1.2
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Sat Nov 26 21:44:26 UTC 2005
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12984/example-tutorial
Modified Files:
Makefile example-tutorial-en.xml rpm-info.xml
Log Message:
Removed top-level "<release>" element. Added "release" and "role='rpm'"
attributes to the changelog info. Changelog elements marked "role='rpm'"
only appear in the RPM %changelog.
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 11 Oct 2005 23:43:01 -0000 1.15
+++ Makefile 26 Nov 2005 21:44:18 -0000 1.16
@@ -7,12 +7,21 @@
# Copyright 2003 Tammy Fox, Red Hat, Inc.
# Copyright 2005 Tommy Reynolds, MegaCoder.com
###############################################################################
+# There is actually no "de" translation. All the '*-de*" files are just
+# fodder to check the internationalization (i18n) workings for the FTP.
+# No discourtesey to an Germanic speaker is intended. -- Tommy Reynolds
+###############################################################################
#
# Document-specific definitions.
#
-LANGUAGES = en
+LANGUAGES = en de
DOCBASE = example-tutorial
-XMLEXTRAFILES-en=
+#
+DOCTITLE-en = Example Tutorial
+XMLEXTRAFILES-en=article-info-en.xml
+#
+DOCTITLE-de = Beispiel Tutorial
+XMLEXTRAFILES-de=
#
######################################################
include ../docs-common/Makefile.common
@@ -27,6 +36,14 @@
#${DOCBASE}-en/index.html::
# echo FINISHED AT LAST
+######################################################
+#
+article-info-en.xml:: rpm-info.xml
+ xsltproc -o $@ --stringparam doctype articleinfo ../docs-common/packaging/bookinfo.xsl rpm-info.xml
+
+clean::
+ ${RM} bookinfo.xml
+######################################################
######################################################
# Some packaging specific vars
Index: example-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- example-tutorial-en.xml 18 Sep 2005 22:55:34 -0000 1.15
+++ example-tutorial-en.xml 26 Nov 2005 21:44:18 -0000 1.16
@@ -1,4 +1,5 @@
<!-- $Id: -->
+
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
@@ -7,70 +8,42 @@
<!ENTITY BOOKID "example-tutorial-0.14 (2005-09-18)"> <!-- change version of manual and date here -->
+<!ENTITY ARTICLE-INFO-EN SYSTEM "article-info-en.xml" >
+
]>
<article id="example-tutorial" lang="en">
- <articleinfo>
- <title>Example Tutorial</title>
- <copyright>
- <year>2003, 2005</year>
- <holder>&FORMAL-RHI;</holder>
- <holder>Tammy Fox</holder>
- </copyright>
- <authorgroup>
- <author>
- <surname>Fox</surname>
- <firstname>Tammy</firstname>
- </author>
- <editor>
- <surname>Frields</surname>
- <firstname>Paul</firstname>
- <othername role="mi">W.</othername>
- </editor>
- </authorgroup>
- &LEGALNOTICE;
- <revhistory>
- <revision>
- <revnumber>0.13</revnumber>
- <date>2005-09-18</date>
- <authorinitials>PaulWFrields</authorinitials>
- <revdescription>
- <para>
- Add revision history.
- </para>
- </revdescription>
- </revision>
- </revhistory>
- </articleinfo>
+
+ &ARTICLE-INFO-EN;
<section id="sn-some-section">
<title>Some Section</title>
-
<indexterm>
<primary>Index term</primary>
</indexterm>
-
<para>
- This is an example section. You should not use sect1, sect2, etc., since
- those tags will make sections less modular — that is, harder to
- relocate without changing a lot of other markup.
+ This is an example section. You should not use sect1, sect2, etc.,
+ since those tags will make sections less modular — that is,
+ harder to relocate without changing a lot of other markup.
</para>
+
<para>
- Keep text within the <command>title</command> tags on the same line as the
- tags. Nesting the title on a separate line from the enclosing tags results
- in extra spaces in HTML rendering.
+ Keep text within the <command>title</command> tags on the same
+ line as the tags. Nesting the title on a separate line from the
+ enclosing tags results in extra spaces in HTML rendering.
</para>
<warning>
<title>Warning</title>
+
<para>
Example of an admonition.
</para>
</warning>
<para>
- This paragraph illustrates the use of command syntax to accomplish a
- task. Note that specific filenames denoting versions should be
+ This paragraph illustrates the use of command syntax to accomplish
+ a task. Note that specific filenames denoting versions should be
avoided. To install any RPM package, use the following syntax:
</para>
<screen>
@@ -78,11 +51,11 @@
</screen>
<para>
Notice that the <command>screen</command> section is entirely
- left-justified with no preceding indent. This is necessary to ensure
- proper rendering in PDFs. Also notice that the entire
+ left-justified with no preceding indent. This is necessary to
+ ensure proper rendering in PDFs. Also notice that the entire
<command>command</command> has been surrounded by
- <command>userinput</command> since the user types this
- command. Computer output would be enclosed in
+ <command>userinput</command> since the user types this command.
+ Computer output would be enclosed in
<command>computeroutput</command> tags, as in the following
sample.
</para>
@@ -92,42 +65,59 @@
</screen>
<para>
Lines should be broken <emphasis>exactly</emphasis> as they are
- on-screen. Also, note that spaces inside <command>screen</command> tags
- are automatically treated as non-breaking.
+ on-screen. Also, note that spaces inside <command>screen</command>
+ tags are automatically treated as non-breaking.
</para>
<tip>
<title>Fill modes and <command>screen</command> tags</title>
<para>
- Using automatic or manual fill commands in Emacs/PSGML will sometimes
- mangle <command>screen</command> sections. Use care when performing fill
- operations, and check the results.
+ Using automatic or manual fill commands in Emacs/PSGML will
+ sometimes mangle <command>screen</command> sections. Use care
+ when performing fill operations, and check the results.
</para>
</tip>
</section>
<section>
<title>Callout Example</title>
- <programlisting id="pl-callout">
+<programlisting id="pl-callout">
Line 1 <co id="pl-callout-L1"/>
Line 2
Line 3
Line 4 <co id="pl-callout-L4"/>
</programlisting>
- <calloutlist>
- <callout arearefs="pl-callout-L1">
- <para>
- Here is a callout.
- </para>
- </callout>
- <callout arearefs="pl-callout-L4">
- <para>
- The second callout.
- </para>
- </callout>
- </calloutlist>
+ <calloutlist>
+ <callout arearefs="pl-callout-L1">
+ <para>
+ Here is a callout.
+ </para>
+ </callout>
+ <callout arearefs="pl-callout-L4">
+ <para>
+ The second callout.
+ </para>
+ </callout>
+ </calloutlist>
+ </section>
+
+ <section>
+ <title>Deeply nested sections</title>
+ <para>Early to bed, early to rise</para>
+ <section>
+ <title>Second Level</title>
+ <para>Is the curse of the working class</para>
+ <section>
+ <title>Third Level</title>
+ <para>He who can, does</para>
+ <section>
+ <title>Fourth Level</title>
+ <para>He who cannot, manages.</para>
+ </section>
+ </section>
+ </section>
</section>
-<index id="generated-index"></index>
+ <index id="generated-index"></index>
</article>
<!--
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/rpm-info.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-info.xml 25 Nov 2005 21:01:59 -0000 1.1
+++ rpm-info.xml 26 Nov 2005 21:44:18 -0000 1.2
@@ -3,12 +3,11 @@
<!-- Sample document description from which we build RPMs -->
<!DOCTYPE rpm-info SYSTEM "../docs-common/packaging/rpm-info.dtd">
<rpm-info>
- <release rel="1"/>
<author email="tcf at redhat.com" firstname="Tammy" initials="TCF" surname="Fox" wholename="Tammy Fox"/>
<editor email="stickster at gmail.com" firstname="Paul" surname="Frields" wholename="Paul W. Frields"/>
<license>
<rights>GNU FDL</rights>
- <license.version>1.0</license.version>
+ <version>1.0</version>
</license>
<copyright>
<year>2003, 2004, 2005</year>
@@ -26,7 +25,11 @@
</translation>
</titles>
<changelog order="newest-first">
- <revision date="2005-09-18" version="0.13">
+ <revision date="Sat 26 Nov 2005" release="2" version="1.0.0" role="rpm">
+ <author email="me at home.net" firstname="Me" initials="I" surname="Myself" wholename="Me Myself"/>
+ <details>Some rpm-only changes</details>
+ </revision>
+ <revision date="2005-09-18" release="1" version="0.13">
<author email="stickster at gmail.com" firstname="Paul" initials="PWF" surname="Frields" wholename="Paul W. Frields"/>
<details>Add revision history</details>
</revision>
More information about the docs-commits
mailing list