You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2007/03/26 21:38:16 UTC
svn commit: r522605 - /db/derby/docs/trunk/src/conrefs.dita
Author: rhillegas
Date: Mon Mar 26 12:38:16 2007
New Revision: 522605
URL: http://svn.apache.org/viewvc?view=rev&rev=522605
Log:
It looks as though a cut-and-paste error duplicated the contents of conrefs.dita. This, in turn created an unparseable dita file and broke the build of adminguide. I have pruned out the duplicate contents. Now adminguide builds cleanly.
Modified:
db/derby/docs/trunk/src/conrefs.dita
Modified: db/derby/docs/trunk/src/conrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/conrefs.dita?view=diff&rev=522605&r1=522604&r2=522605
==============================================================================
--- db/derby/docs/trunk/src/conrefs.dita (original)
+++ db/derby/docs/trunk/src/conrefs.dita Mon Mar 26 12:38:16 2007
@@ -64,69 +64,3 @@
</conbody>
</concept>
</dita>
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE dita PUBLIC "-//OASIS//DTD DITA Composite//EN"
- "../dtd/ditabase.dtd">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<dita>
-<concept id="prod" xml:lang="en-us">
-<title>Product specific entities</title>
-<conbody>
-<p>Naming convention: <userinput><varname>abb</varname></userinput> (abbreviation
-for product) followed by <userinput>l</userinput> (long version) or <userinput>s</userinput> (short
-version), followed by <userinput>t</userinput> if the reference is pre-marked
-with trademarks.</p>
-<p><ph id="productshortname">Derby</ph></p>
-<p><ph id="productlongname">Apache Derby</ph></p>
-<p><ph id="productinstallname">Derby_10</ph></p>
-<p><ph id="productinstallpath">DERBY_HOME</ph></p>
-<p><ph id="productlowercase">derby</ph></p>
-</conbody>
-</concept>
-<concept id="vers" xml:lang="en-us">
-<title>Version and release numbers</title>
-<conbody>
-<p><ph id="fullversionnumber">Version 10.2</ph></p>
-<p><ph id="shortversionnumber">10.2</ph></p>
-</conbody>
-</concept>
-<concept id="pub" xml:lang="en-us">
-<title>Publications</title>
-<conbody>
-<p>Naming convention: <userinput>cit<varname>ABB</varname></userinput>, where <userinput>cit</userinput> is
-the indicator that the conref is to a publication title and <varname>ABB</varname> is
-the abbreviation for the publication (say, 2-6 characters).</p>
-<p>We can't use the "correct" DITA cite tag because the IDD wrapper can't
-handle it.</p>
-<p><ph id="citdevelop"><i>Derby Developer's Guide</i></ph></p>
-<p><ph id="citadmin"><i>Derby Server and Administration Guide</i></ph></p>
-<p><ph id="citref"><i>Derby Reference Manual</i></ph></p>
-<p><ph id="citutilities"><i>Derby Tools and Utilities Guide</i></ph></p>
-<p><ph id="citgetstart"><i>Getting Started with Derby</i></ph></p>
-<p><ph id="cittuning"><i>Tuning Derby</i></ph></p>
-</conbody>
-</concept>
-<concept id="paths" xml:lang="en-us">
-<title>Paths</title>
-<conbody>
-<p><ph id="pathdownload">http://db.apache.org/derby/derby_downloads.html</ph></p>
-<p><ph id="pathsource">http://db.apache.org/derby/dev/derby_source.html</ph></p>
-</conbody>
-</concept>
-</dita>