diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-12-26 12:42:57 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-12-26 12:42:57 +0000 |
| commit | 248f1fe188fe2307b9dcf2c87a83b653eaa1920c (patch) | |
| tree | d5d0959a70218946ff72e107a6c106e32479a398 /cpp/docs/man | |
| parent | 3c83a0e3ec7cf4dc23e83a340b25f5fc1676f937 (diff) | |
| download | qpid-python-248f1fe188fe2307b9dcf2c87a83b653eaa1920c.tar.gz | |
synchronized with trunk except for ruby dir
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/docs/man')
| -rw-r--r-- | cpp/docs/man/Makefile.am | 20 | ||||
| -rw-r--r-- | cpp/docs/man/qpidd.x | 6 |
2 files changed, 22 insertions, 4 deletions
diff --git a/cpp/docs/man/Makefile.am b/cpp/docs/man/Makefile.am index 08b100121b..cb13a16e4f 100644 --- a/cpp/docs/man/Makefile.am +++ b/cpp/docs/man/Makefile.am @@ -1,3 +1,21 @@ +# +# 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. +# dist_man_MANS = qpidd.1 man_aux = $(dist_man_MANS:.1=.x) @@ -17,7 +35,7 @@ qpidd.1: $(srcdir)/qpidd.x $(top_builddir)/src/qpidd .x.1: @rm -f $@ @echo "Updating man page $@" - $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* + $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t --help-option="--help --no-module-dir" --version-option="--version --no-module-dir" ../../src/$* @chmod a-w $@-t @mv $@-t $@ else diff --git a/cpp/docs/man/qpidd.x b/cpp/docs/man/qpidd.x index edbe7b3bff..9f1b465701 100644 --- a/cpp/docs/man/qpidd.x +++ b/cpp/docs/man/qpidd.x @@ -28,8 +28,8 @@ Each line is a name=value pair. Blank lines and lines beginning with # are ignor # My qpidd configuration file. port=6000 max-connections=10 - log-output=stdout - log-output=/tmp/qpidd.log + log-to-stdout=yes + log-to-file=/tmp/qpidd.log [ENVIRONMENT] .I QPID_<option> @@ -41,6 +41,6 @@ The environment variable is the option name in uppercase, prefixed with QPID_ an export QPID_PORT=6000 export QPID_MAX_CONNECTIONS=10 - export QPID_LOG_OUTPUT=/tmp/qpidd.log + export QPID_LOG_TO_FILE=/tmp/qpidd.log |