Skip to content

Committing with oXygen XML Web Author #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggbt wants to merge 2 commits into
base: masteriae
Choose a base branch
from
Open

Committing with oXygen XML Web Author #112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd67121
Committing with oXygen XML Web Author
ggbt Feb 28, 2018
7e9ac24
Committing with oXygen XML Web Author
ggbt Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions flowers/topics/flowers/iris.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd">
<topic id="topic-1">
<title>Iris</title>
<title>Iris2</title>
<body>
<p><i>From Wikipedia, the free encyclopedia.</i></p>
<p><b>Iris</b><indexterm>flowers<indexterm>spring<indexterm>iris</indexterm></indexterm></indexterm>
is a <xref keyref="flowers.genus" format="dita">genus</xref> of
between 200-300 species of flowering plants with showy flowers. It takes its name from
the Greek word for a <i>rainbow</i>, referring to the wide variety of flower colors
found among the many species. As well as being the scientific name, iris is also very
widely used as a common name; for one thing, it refers to all <b>Iris</b> species, but
some plants called thus belong to closely related genera. In North America, a common
name for irises is <b>flags</b>, while the subgenus <b>Scorpiris</b> is widely known as
<b>junos</b>, particularly in horticulture.</p>
<p><b>Iris</b><indexterm>flowers<indexterm>spring<indexterm>iris</indexterm></indexterm></indexterm>
is a <xref keyref="flowers.genus" format="dita">genus</xref> of between 200-300 species
of flowering plants with showy flowers. It takes its name from the Greek word for a
<i>rainbow</i>, referring to the wide variety of flower colors found among the many
species. As well as being the scientific name, iris is also very widely used as a common
name; for one thing, it refers to all <b>Iris</b> species, but some plants called thus
belong to closely related genera. In North America, a common name for irises is
<b>flags</b>, while the subgenus <b>Scorpiris</b> is widely known as <b>junos</b>,
particularly in horticulture. One more</p>
<p><image href="../../images/Iris_sanguinea.jpg" scale="50"/></p>
<p>The <xref keyref="flowers.genus" format="dita">genus</xref> is widely
distributed throughout the north temperate zone. Their habitats are considerably varied,
Expand Down