Merge branch 'develop'

Juniper · Apr 21, 2017 · 26a860f · 26a860f
2 parents 215947c + 9d3e657
commit 26a860f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/bin/new-release b/bin/new-release
@@ -102,6 +102,8 @@ cd $GIT_DIR/build
 run "configure" "../configure $CONFIGURE_OPTS"
 run "build and test" \
     "make clean && make && make install && make test && make dist"
+run "make distcheck" "make distcheck"
+
 run "Commit any changes" "gt commit"
 
 run "upload any documentation changes to gh-pages/" "make upload"

diff --git a/doc/oxtradoc/oxtradoc.in b/doc/oxtradoc/oxtradoc.in
@@ -957,7 +957,7 @@ sub start_org_table {
     print " title=\"", esc($title), "\"" if $title;
     print "\>\n";
     $org_header = 0;
-    org_table_header() unless $line =~ /^\--/;
+    org_table_header() unless $line =~ /^\|?--/;
 }
 
 sub org_table_header {

diff --git a/doc/slax.txt b/doc/slax.txt
@@ -479,7 +479,7 @@ referenced using their name prefixed by the dollar sign.
     match / {
         <outer> {
             apply-templates configuration/system {
-                with $host=configuration/system/host-name;
+                with $host = configuration/system/host-name;
             }
         }
     }
@@ -491,7 +491,7 @@ referenced using their name prefixed by the dollar sign.
      * generated, which contains the value of the host parameter.
      */
     match system {
-        param $name = host;
+        param $host;
         <inner> $host;
     }