This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit 00bbcfc4be3f5edfcb78e4447b0b5b5b0a9c51a6
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Sun Nov 11 22:46:09 2018 +0100
new copyright notice in rivetChannel.c, minor fixes in configure.ac and
doc/xml/commands.xml
---
ChangeLog | 5 +++++
configure.ac | 2 +-
doc/xml/commands.xml | 2 +-
src/mod_rivet_ng/rivetChannel.c | 35 ++++++++++++++++++++---------------
4 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 761a496..5b2ac83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-11 Massimo Manghi <mxman...@apache.org>
+ * configure.ac: correct macro description
+ * src/mod_rivet_ng/rivetChannel.c: new copyright notice
+ * doc/xml/commands.xml: correct sentence in ::rivet::exit manual page
+
2018-11-02 Massimo Manghi <mxman...@apache.org>
* src/mod_rivet_ng/mod_rivet.[c|h]: add macro RIVET_MPM_BRIDGE to
compose rivet bridge names
diff --git a/configure.ac b/configure.ac
index 952ab5d..cdbd67c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -726,7 +726,7 @@ AC_DEFUN([RIVET_COMMANDS_EXPORT],[
# IMPORT_RIVET_COMMANDS (--enable-import-rivet-commands).
# For compatibility the module can be compiled and installed forcing rivet
# to import commands from ::rivet into the global namespace.
-# Default: yes
+# Default: no
AC_DEFUN([IMPORT_RIVET_COMMANDS],[
AC_ARG_ENABLE(
diff --git a/doc/xml/commands.xml b/doc/xml/commands.xml
index 4971cbf..be99749 100644
--- a/doc/xml/commands.xml
+++ b/doc/xml/commands.xml
@@ -647,7 +647,7 @@
could be the only way to exit a process and
force the Apache HTTP web server to start
a fresh one. Moreover the core
<command>exit</command> could be called from third parties
software and you may not be aware of it. We
thus decided to trap this command and give it
- the most gentle behavior still preserving the
its basic purpose.
+ the most gentle behavior still preserving its
basic purpose.
</para>
<note>
Nonetheless we discourage the programmer to use
such command, and suggest to focus on proper
diff --git a/src/mod_rivet_ng/rivetChannel.c b/src/mod_rivet_ng/rivetChannel.c
index 22a1b95..d6ec90f 100644
--- a/src/mod_rivet_ng/rivetChannel.c
+++ b/src/mod_rivet_ng/rivetChannel.c
@@ -1,20 +1,25 @@
-/* rivetChannel.c -- describes the mod_rivet Tcl output channel. */
-
-/* Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+/* rivetChannel.c -- mod_rivet Tcl output channel. */
+
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
+
/* Rivet config */
#ifdef HAVE_CONFIG_H
#include <rivet_config.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
