Author: lucius
Date: Mon Mar 5 20:43:03 2007
New Revision: 3909
Added:
trunk/xubuntu/desktopguide/C/preface.xml
Modified:
trunk/xubuntu/desktopguide/C/desktopguide.xml
trunk/xubuntu/libs/xubuntu.ent
Log:
fix #81788
Modified: trunk/xubuntu/desktopguide/C/desktopguide.xml
==============================================================================
--- trunk/xubuntu/desktopguide/C/desktopguide.xml (original)
+++ trunk/xubuntu/desktopguide/C/desktopguide.xml Mon Mar 5 20:43:03 2007
@@ -14,7 +14,7 @@
<book lang="en" id="x01">
<title>Xubuntu Desktop Guide</title>
<xi:include href="bookinfo.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="../../../common/C/preface.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="introduction.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="guided-tour.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="common-tasks.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
Added: trunk/xubuntu/desktopguide/C/preface.xml
==============================================================================
--- (empty file)
+++ trunk/xubuntu/desktopguide/C/preface.xml Mon Mar 5 20:43:03 2007
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
+<!ENTITY % globalent SYSTEM "../../../libs/global.ent">
+%globalent;
+<!ENTITY % xubuntu-ent SYSTEM "../../../xubuntu/libs/xubuntu.ent">
+%xubuntu-ent;
+<!ENTITY % cdo-C SYSTEM "../../../libs/cdo-C.ent">
+%cdo-C;
+<!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
+%xinclude;
+<!ENTITY language "en">
+<!ENTITY ubuntu '<phrase>Ubuntu</phrase>'>
+]>
+<preface id="preface" status="complete">
+ <title>About This Guide</title>
+ <sect1 id="conventions" status="complete">
+ <title>Conventions</title>
+ <para>
+ <emphasis role="bold">The following notes will
be used
+ throughout the book:
+ </emphasis>
+ </para>
+ <note>
+ <para>A note presents interesting, sometimes
technical, pieces
+ of information related to the
surrounding discussion.
+ </para>
+ </note>
+ <tip>
+ <para>A tip offers advice or an easier way of
doing
+ something.
+ </para>
+ </tip>
+ <caution>
+ <para>A caution alerts the reader to potential
problems and
+ helps avoid them.
+ </para>
+ <!-- Direct referencing in a non-instructional
context is bad. -->
+ </caution>
+ <warning>
+ <para>A warning advises the reader of a hazard
that
+ may arise in a given scenario.
+ </para>
+ </warning>
+ <para>
+ <emphasis role="bold">Cross-reference
conventions for print will
+ be displayed as follows:
+ </emphasis>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>Links to other documents or
websites will look like <ulink url="http://www.ubuntu.com";>this</ulink>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>PDF, HTML, and XHTML versions of this
document will use
+ hyperlinks to handle cross-referencing.
+ </para>
+ </note>
+ <para>
+ <emphasis role="bold">Type conventions will be
displayed as
+ follows:
+ </emphasis>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>File names or paths to
directories will be shown in
+ <filename>monospace</filename>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Commands that you type at a
<application>Terminal</application>
+ command prompt will
+ be shown as:
+ </para>
+ <para>
+ <!-- NOTE: the spaces before
</screen> are significant, and will be in the html output. -->
+ <screen>command to type
</screen>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Options that you click, select,
or choose in a user
+ interface will look like
<guibutton>this</guibutton>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ <emphasis role="bold">Menu selections, mouse
actions, and
+ keyboard short-cuts:
+ </emphasis>
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>A sequence of menu selections
will be displayed as
+ follows: <menuchoice>
+ <guimenu>
+
<accel>F</accel>ile
+ </guimenu>
+ <guimenuitem>
+
<accel>O</accel>pen
+ </guimenuitem>
+ </menuchoice>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Mouse actions shall assume a
right-handed mouse
+ configuration. The terms
<quote><mousebutton>click</mousebutton></quote>
+ and
<quote><mousebutton>double-click</mousebutton></quote>
+ refer to using the left mouse
button. The term <quote><mousebutton>right-click</mousebutton></quote>
+ refers to using the right mouse
button. The
+ term
<quote><mousebutton>middle-click</mousebutton></quote>
+ refers to using the middle
mouse button,
+ pressing down on the scroll
wheel, or pressing both the
+ left and right buttons
simultaneously, based on the
+ design of your mouse.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Keyboard shortcut combinations
will be displayed as
+ follows: <keycombo>
+ <keycap>Ctrl</keycap>
+ <keycap>N</keycap>
+ </keycombo>
+ .Where the conventions for
+ <quote>Control</quote>,
<quote>Shift,</quote> and
+ <quote>Alternate</quote> keys
will be
+ <keycap>Ctrl</keycap>,
<keycap>Shift</keycap>, and
+ <keycap>Alt</keycap>,
respectively, and shall mean
+ the first key is to be held
down while pressing the
+ second key.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </sect1>
+ <sect1 id="sect-contributing" status="complete">
+ <title>Contributing and Feedback</title>
+ <para>This guide is developed by the <ulink
url="&xubuntu-doc-team;">Xubuntu Documentation Team</ulink>.
<emphasis>You</emphasis> can contribute to this document by sending ideas or
comments to the Ubuntu Documentation Team mailing list. Visit the <ulink
url="&xubuntu-doc-team;">Xubuntu Documentation Team Website</ulink> or the
<ulink url="&ubuntu-doc-team;">Ubuntu Documentation Team Website</ulink> for
further information.
+ </para>
+ <para>If you see a problem with this document, or would
like to make a suggestion, you can simply file a bug report at the <ulink
url="&xubuntu-doc-bugs;">Bugtracker for the Xubuntu Documentation</ulink>. Your
help is vital to the success of our documentation!</para>
+ <para>Many thanks,</para>
+ <para>-Your X/Ubuntu Documentation Team</para>
+ </sect1>
+
+</preface>
Modified: trunk/xubuntu/libs/xubuntu.ent
==============================================================================
--- trunk/xubuntu/libs/xubuntu.ent (original)
+++ trunk/xubuntu/libs/xubuntu.ent Mon Mar 5 20:43:03 2007
@@ -3,6 +3,8 @@
<!ENTITY dg-title 'Desktop Guide'>
<!ENTITY xubuntu '<phrase>Xubuntu</phrase>'>
<!ENTITY xubuntu-team 'Xubuntu Team'>
+<!ENTITY xubuntu-doc-team 'https://launchpad.net/~xubuntu-doc/'>
+<!ENTITY xubuntu-doc-bugs
'https://launchpad.net/ubuntu/+source/xubuntu-docs/+bugs' >
<!ENTITY xfce 'Xfce'>
<!ENTITY kubuntu 'Kubuntu'>
--
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
