Merge branch 'develop'

.gitignore

@@ -23,6 +23,7 @@ aclocal.m4
 ar-lib
 autom4te.cache
 build
+compile
 config.guess
 config.h.in
 config.sub

bin/Makefile.am

@@ -1,7 +1,5 @@
 #
-# $Id$
-#
-# Copyright 2011, Juniper Networks, Inc.
+# Copyright 2013, Juniper Networks, Inc.
 # All rights reserved.
 # This SOFTWARE is licensed under the LICENSE provided in the
 # ../Copyright file. By downloading, installing, copying, or otherwise

bin/gt

@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # Copyright 2013, Juniper Networks, Inc.
 # All rights reserved.
 # This SOFTWARE is licensed under the LICENSE provided in the
@@ -28,6 +26,9 @@ function check_in_details () {
  /bin/echo "[Checking $file into branch $branch]"
  /bin/echo -n "Commit message: "
  read comment
+ if [ "$comment" = "==" -o "$comment" = "ditto" ]; then
+ comment="$last"
+ fi
  if [ "$comment" = "" ]; then
  echo "Skipping file $file";
  else
@@ -36,6 +37,7 @@ function check_in_details () {
  fi
  git commit -m "$comment" "$file"
  fi
+ last="$comment"
  done
 }
 
@@ -138,6 +140,17 @@ case "$op" in
  fi
  ;;
 
+ merge-softly-from)
+ set_branch
+ from=$1
+ if [ x"$from" = x ]; then
+ echo "missing branch name"
+ exit 1
+ fi
+ echo "Merging $from into $branch ..."
+ git -c core.editor=/usr/bin/true merge --no-ff $from
+ ;;
+
  outstanding|out|what)
  set_branch
  git diff origin/$branch $branch

bin/setup.sh

@@ -1,6 +1,4 @@
 #
-# $Id$
-#
 # Copyright 2013, Juniper Networks, Inc.
 # All rights reserved.
 # This SOFTWARE is licensed under the LICENSE provided in the

configure.ac

@@ -450,8 +450,9 @@ AC_CONFIG_FILES([
  extensions/Makefile
  extensions/bit/Makefile
  extensions/curl/Makefile
- extensions/xutil/Makefile
+ extensions/exslt/Makefile
  extensions/os/Makefile
+ extensions/xutil/Makefile
  slaxproc/Makefile
  tests/Makefile
  tests/core/Makefile

doc/Makefile.am

@@ -1,7 +1,5 @@
 #
-# $Id$
-#
-# Copyright 2011, Juniper Networks, Inc.
+# Copyright 2011-2013, Juniper Networks, Inc.
 # All rights reserved.
 # This SOFTWARE is licensed under the LICENSE provided in the
 # ../Copyright file. By downloading, installing, copying, or otherwise

doc/oxtradoc/oxtradoc.in

@@ -51,7 +51,7 @@
 # '?' at the beginning of a line make the following section an 
 # Open Question
 #
-# outline2xml tries to detect XML, ascii-art, and code. Each
+# oxtradoc tries to detect XML, ascii-art, and code. Each
 # such block will be a <figure>. Note that a block is ended by
 # a single newline at a line, so if the code has empty newlines,
 # these lines have to be changed to either a sinlge '@' or e.g. a ' '.