Skip to content

Commit

Permalink
Merge tag 'v0.9.6' into develop
Browse files Browse the repository at this point in the history
Release 0.9.6

* GeekoDoc
  * Remove title in step (#4)
  * Empty <xref/> does not trigger a warning (#9)
  * Allow common attributes in link (#10)
  * Disallow xreflabel (#11)
  * Restrict <results> element (#14)

* Novdoc
  * Missing novdocx-core.rnc (#5)
  * Allow <mediaobject> only in <figure> and <informalfigure> (#7)
  * Fix content model for step to allow para, substeps, para (#12)
  * Allow phrase inside productnumber (#13)

* Both
 * Update Novdoc/GeekoDoc to disallow screen in entry (#2)
  • Loading branch information
tomschr committed Nov 24, 2016
2 parents 1639200 + 4044fac commit 741bafe
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
22 changes: 22 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
------------------------------------------------------------------
Thu Nov 24 15:16:00 UTC 2016 - toms@opensuse.org

Release 0.9.6

* GeekoDoc
* Remove title in step (#4)
* Empty <xref/> does not trigger a warning (#9)
* Allow common attributes in link (#10)
* Disallow xreflabel (#11)
* Restrict <results> element (#14)

* Novdoc
* Missing novdocx-core.rnc (#5)
* Allow <mediaobject> only in <figure> and <informalfigure> (#7)
* Fix content model for step to allow para, substeps, para (#12)
* Allow phrase inside productnumber (#13)

* Both
* Update Novdoc/GeekoDoc to disallow screen in entry (#2)


------------------------------------------------------------------
Fri Aug 19 13:55:00 UTC 2016 - toms@opensuse.org

Expand Down
2 changes: 1 addition & 1 deletion geekodoc/rng/geekodoc5-flat.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace trans = "http://docbook.org/ns/transclusion"
namespace xi = "http://www.w3.org/2001/XInclude"
namespace xlink = "http://www.w3.org/1999/xlink"

suse.schema.version = "5.1-subset GeekoDoc-0.9.5"
suse.schema.version = "5.1-subset GeekoDoc-0.9.6"
#
div {
div {
Expand Down
2 changes: 1 addition & 1 deletion geekodoc/rng/geekodoc5.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace trans="http://docbook.org/ns/transclusion"

datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"

suse.schema.version = "5.1-subset GeekoDoc-0.9.5"
suse.schema.version = "5.1-subset GeekoDoc-0.9.6"

#
include "transclusion.rnc"
Expand Down

0 comments on commit 741bafe

Please sign in to comment.