Merge branch 'release/v1.0.4'

.travis.yml

@@ -26,4 +26,3 @@ install:
 # commands to run tests
 script:
     - ./geekodoc/tests/run-tests.sh -V jing
-    - ./novdoc/tests/run-tests.sh

ChangeLog

@@ -1,3 +1,14 @@
+------------------------------------------------------------------
+Fri Feb 01 14:48:00 UTC 2018 - toms@opensuse.org
+
+Release 1.0.4
+
+GeekoDoc:
+ * No changes
+
+Novdoc:
+ * Move it into maintenance/novdoc-2019-02-01 branch
+
 ------------------------------------------------------------------
 Mon Jun 25 10:54:00 UTC 2018 - toms@opensuse.org
 

README.md

@@ -3,14 +3,6 @@
 [![Build Status](https://travis-ci.org/openSUSE/geekodoc.svg?branch=develop)](https://travis-ci.org/openSUSE/geekodoc)
 
 
-## NovDoc
-
-This is the Novdoc and Geekodoc schemas. Although Novdoc is technically not
-based on DocBook the tags and structure are.
-
-In general, XML instances of Novdoc should be compatible to DocBook.
-
-
 ## GeekoDoc
 
 GeekoDoc is a RELAX NG schema and a subset of DocBook 5. Currently, it can be
@@ -39,7 +31,7 @@ Use one of the following methods to install `rnginline`:
 
 ### Installing rnginline from RPM Package
 
-The following procedure can be used for openSUSE Leap 42.1:
+The following procedure can be used for the latest openSUSE Leap release:
 
 1. Add the repository:
 

geekodoc/rng/geekodoc5.rnc

@@ -33,7 +33,7 @@ s:ns [ uri = "http://www.w3.org/1999/xlink"  prefix = "xlink" ]
 s:ns [ uri = "http://www.w3.org/2005/11/its"  prefix = "its" ]
 
 # Constants
-suse.schema.version = "5.1-subset GeekoDoc-1.0.3"
+suse.schema.version = "5.1-subset GeekoDoc-1.0.4"
 
 
 #
@@ -1628,7 +1628,7 @@ include "docbookxi.rnc"
 } # end of include
 
 
-# Redefine content modell here:
+# Redefine content model here:
 
 
 # --- EOF ---