Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (140 commits)
  Update latest maintenance version key to `2.1.0`
  Remove obsolete info on `startcmd` & Ant changes
  Add missing punctuation
  Remove references to obsolete `build_demo` script
  Restore bundled Ant for v2.1 (revert changes for #24)
  Restore `startcmd` for v2.1 (revert changes for #24)
  Fix environment variable reference
  Remove reference to prompted build
  Remove additional references to old Java CLI #11
  Revise Ant references for v2.1 per #24
  Remove `startcmd` references for v2.1. Fixes #24.
  Add link to topic on adding generated text for #31
  Fix typo in G11N shortdesc
  Clarify `#default` role value token
  Call attention to removal of `startcmd` scripts & Ant
  Annotate remaining feature changes for v2.1
  Annotate additional issues resolved in v2.1
  Remove obsolete parameter comment per #22
  Initial annotations for issues resolved in v2.1
  Hyphenate “DITA-OT”
  ...
  • Loading branch information
infotexture committed Jun 26, 2015
2 parents 8576884 + aa85e63 commit 7f61796
Show file tree
Hide file tree
Showing 388 changed files with 7,675 additions and 13,786 deletions.
25 changes: 23 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
out
readme/DITA-messages.xml
# This file specifies intentionally untracked files that Git should ignore

## Directories generated during builds
out/
temp/

## Autogenerated files created by the build process
platform.ditaval
DITA-messages.xml
parameters/ant-parameters.dita
parameters/ant-parameters-base-html-transformation.dita
parameters/ant-parameters-base-transformation.dita
parameters/ant-parameters-docbook-transformation.dita
parameters/ant-parameters-eclipsecontent-transformation.dita
parameters/ant-parameters-eclipsehelp-transformation.dita
parameters/ant-parameters-html5-transformation.dita
parameters/ant-parameters-htmlhelp-transformation.dita
parameters/ant-parameters-javahelp-transformation.dita
parameters/ant-parameters-odt-transformation.dita
parameters/ant-parameters-org.dita-ot.html-transformation.dita
parameters/ant-parameters-pdf-transformation.dita
parameters/ant-parameters-tocjs-transformation.dita
parameters/ant-parameters-troff-transformation.dita
parameters/ant-parameters-wordrtf-transformation.dita
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ _or — even better:_
If you know how to fix the issue yourself, that's great! Here's what to do:

1. [Fork the repository][1],
2. [Create a new branch][2],
2. [Create a new branch][3],
3. Make your changes on the new branch, and
3. [Send a pull request][3].
3. [Send a pull request][2].

### Always create a branch for your changes

Expand Down
14 changes: 8 additions & 6 deletions DITA-OTProjectHome.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "topic.dtd">
<!--This file is part of the DITA Open Toolkit project. See the accompanying LICENSE.md file for applicable licenses.-->

<topic id="dita-otprojecthome" xml:lang="en-us">
<title>DITA Open Toolkit <keyword keyref="release"/></title>
<shortdesc>This document describes the DITA Open Toolkit project—what the project is, and how to
use the site.</shortdesc>
<shortdesc>This document describes the DITA Open Toolkit project—what the project is, and how to use the
site.</shortdesc>
<body>
<section>
<title>What is the DITA Open Toolkit?</title>
<p>The DITA Open Toolkit, or DITA-OT for short, is a set of Java-based, open source tools that provide processing
for DITA maps and topic content. You can download the toolkit and install it for free to get started with
topic-based writing and publishing. The DITA-OT is licensed under the <xref format="html"
href="http://www.apache.org/licenses/LICENSE-2.0" scope="external">Apache 2.0</xref> open source license.</p>
<note>While the DITA Standard itself is owned and developed by OASIS, the DITA Open Toolkit is
an independent, open source implementation of the standard.</note>
<note>While the DITA Standard itself is owned and developed by OASIS, the DITA Open Toolkit is an independent,
open source implementation of the standard.</note>
<p>Key output formats for the toolkit include:</p>
<ul>
<li>XHTML</li>
Expand All @@ -25,7 +27,7 @@
<li>Eclipse Content (normalized DITA plus Eclipse project files)</li>
<li>Word RTF (with some limitations)</li>
<li>Docbook</li>
<li>Troff</li>
<li>troff</li>
</ul>
</section>
<section>
Expand All @@ -49,7 +51,7 @@
href="http://sourceforge.net/projects/dita-ot/files/DITA-OT%20Latest%20Test%20Build/"
scope="external">
<linktext>DITA-OT latest development build</linktext>
</link>-->
</link>-->
</linklist>
</related-links>
</topic>
250 changes: 250 additions & 0 deletions DITA-OT_docs.xpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="17.0">
<meta>
<filters directoryPatterns="out, temp" filePatterns="Icon.png" positiveFilePatterns="" showHiddenFiles="false"/>
<options>
<serialized version="17.0" xml:space="preserve">
<serializableOrderedMap>
<entry>
<String>editor.hard.line.wrap</String>
<Boolean>true</Boolean>
</entry>
<entry>
<String>editor.indent.size.v9.2</String>
<Integer>2</Integer>
</entry>
<entry>
<String>editor.line.width</String>
<Integer>120</Integer>
</entry>
<entry>
<String>key.editor.format.option.pane.group</String>
<Boolean>true</Boolean>
</entry>
<entry>
<String>keys.context</String>
<String>${pdu}/userguide.ditamap</String>
</entry>
<entry>
<String>scenario.associations</String>
<scenarioAssociation-array>
<scenarioAssociation>
<field name="url">
<String>userguide.ditamap</String>
</field>
<field name="scenarioIds">
<list>
<String>DITA-OT User Guide WebHelp</String>
</list>
</field>
<field name="scenarioTypes">
<list>
<String>DITAMAP</String>
</list>
</field>
</scenarioAssociation>
</scenarioAssociation-array>
</entry>
<entry>
<String>scenarios</String>
<scenario-array>
<ditaScenario>
<field name="useXEP">
<Boolean>false</Boolean>
</field>
<field name="useAntennaHouse">
<Boolean>false</Boolean>
</field>
<field name="baseDir">
<String>${cfd}</String>
</field>
<field name="outputDir">
<String>${cfd}/out/webhelp</String>
</field>
<field name="tempDir">
<String>${cfd}/temp/webhelp</String>
</field>
<field name="transtype">
<String>webhelp</String>
</field>
<field name="filters">
<ditavalFilters>
<field name="useDitavalFilePath">
<Boolean>false</Boolean>
</field>
<field name="useAppliedConditionSet">
<Boolean>true</Boolean>
</field>
<field name="appliedConditionSet">
<null/>
</field>
<field name="ditavalFilePath">
<String></String>
</field>
<field name="simpleFiltersList">
<list/>
</field>
</ditavalFilters>
</field>
<field name="addOxygenJars">
<Boolean>true</Boolean>
</field>
<field name="skinCssFile">
<String>/Applications/oxygen/frameworks/dita/DITA-OT/plugins/com.oxygenxml.webhelp/predefined-skins/dita/oxygen/skin.css</String>
</field>
<field name="lastCustomSkinCssPath">
<null/>
</field>
<field name="additionalAntArgs">
<String></String>
</field>
<field name="buildTarget">
<String></String>
</field>
<field name="buildFilePath">
<String></String>
</field>
<field name="ditaParams">
<list>
<ditaParameter>
<field name="name">
<String>args.xhtml.classattr</String>
</field>
<field name="description">
<null/>
</field>
<field name="value">
<String>yes</String>
</field>
<field name="defaultValue">
<String>yes</String>
</field>
<field name="type">
<Integer>4</Integer>
</field>
<field name="possibleValues">
<String-array>
<null/>
<String>yes</String>
<String>no</String>
</String-array>
</field>
</ditaParameter>
</list>
</field>
<field name="jvmArgs">
<String>-Xmx384m</String>
</field>
<field name="useCustomJavaHome">
<Boolean>false</Boolean>
</field>
<field name="customJavaHomeDir">
<String></String>
</field>
<field name="useCustomANTHome">
<Boolean>false</Boolean>
</field>
<field name="customANTHomeDir">
<String></String>
</field>
<field name="workingDir">
<null/>
</field>
<field name="showConsoleAlways">
<Boolean>false</Boolean>
</field>
<field name="advancedOptionsMap">
<null/>
</field>
<field name="name">
<String>DITA-OT User Guide WebHelp</String>
</field>
<field name="baseURL">
<null/>
</field>
<field name="footerURL">
<null/>
</field>
<field name="fOPMethod">
<null/>
</field>
<field name="fOProcessorName">
<null/>
</field>
<field name="headerURL">
<null/>
</field>
<field name="inputXSLURL">
<null/>
</field>
<field name="inputXMLURL">
<null/>
</field>
<field name="defaultScenario">
<Boolean>false</Boolean>
</field>
<field name="isFOPPerforming">
<Boolean>false</Boolean>
</field>
<field name="type">
<String>DITAMAP</String>
</field>
<field name="saveAs">
<Boolean>true</Boolean>
</field>
<field name="openInBrowser">
<Boolean>true</Boolean>
</field>
<field name="outputFile">
<null/>
</field>
<field name="outputResource">
<null/>
</field>
<field name="openOtherLocationInBrowser">
<Boolean>false</Boolean>
</field>
<field name="locationToOpenInBrowserURL">
<String></String>
</field>
<field name="openInEditor">
<Boolean>false</Boolean>
</field>
<field name="showInHTMLPane">
<Boolean>false</Boolean>
</field>
<field name="showInXMLPane">
<Boolean>false</Boolean>
</field>
<field name="showInSVGPane">
<Boolean>false</Boolean>
</field>
<field name="showInResultSetPane">
<Boolean>false</Boolean>
</field>
<field name="useXSLTInput">
<Boolean>false</Boolean>
</field>
<field name="xsltParams">
<list/>
</field>
<field name="cascadingStylesheets">
<String-array/>
</field>
<field name="xslTransformer">
<String>DITA-OT</String>
</field>
<field name="extensionURLs">
<String-array/>
</field>
</ditaScenario>
</scenario-array>
</entry>
</serializableOrderedMap>
</serialized>
</options>
</meta>
<projectTree name="DITA-OT_docs.xpr">
<folder path="."/>
</projectTree>
</project>
Loading

0 comments on commit 7f61796

Please sign in to comment.