diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b439557..f7d31aff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,10 @@ All notable changes to SeisComP are documented here. ## 5.1.0 - scbulletin - - Add option `--fdsn` for printing event parameters on just one line in - FDSN event format supporting to generate catalogs from event XML files. - - Set output string of creation time of first origin time to event. + - Add option `--fdsnws` for printing event parameters on just one line in + FDSN event text format supporting to generate catalogs from event XML + files. + - Correct output string of creation time from first origin time to event. - scdbstrip - Fix reading `--days`. - Add options `-E` and `-Q` as well as module configuration for limiting diff --git a/doc/base/license.rst b/doc/base/license.rst index 189bf7de..93cf59b6 100644 --- a/doc/base/license.rst +++ b/doc/base/license.rst @@ -7,7 +7,7 @@ License In a nutshell ============= -You can use the entire |scname| software collection under +You can use the entire SeisComP software collection under the terms of the GNU AGPL, non-commercially or commercially. You can talk about the software, you can give training sessions with the software, you can install the software wherever you like regardless of whether @@ -16,10 +16,10 @@ You can operate the software and do your business with it. If you want to modify the software then you must publish all the changes you made. Even if you only run it on your servers and expose it to the public. -If you build software applications linking against |scname| libraries you have +If you build software applications linking against SeisComP libraries you have to publish them under the GNU AGPL/GPL if they are for use by others. -If you want to write closed-source software with |scname| you can apply for +If you want to write closed-source software with SeisComP you can apply for a Commercial License. It is your decision whether you want to use the libraries under the GNU AGPL or the Commercial License. You can't do both! @@ -31,12 +31,12 @@ Affero General Public License version 3.0 as published by the Free Software Foundation. Please review the following information to ensure the GNU Affero General Public License version 3.0 requirements will be met. -The |scname| application package is licensed exclusively under the GNU AGPL. +The SeisComP application package is licensed exclusively under the GNU AGPL. Commercial License Usage ======================== -Licensees holding valid commercial |scname| licenses may use the Software in +Licensees holding valid commercial SeisComP licenses may use the Software in accordance with the commercial license agreement between you and gempa GmbH. For further information use the contact form at https://www.gempa.de/contact. diff --git a/doc/build-doc.py b/doc/build-doc.py index 9a3846bb..bb32400d 100644 --- a/doc/build-doc.py +++ b/doc/build-doc.py @@ -368,6 +368,8 @@ def print_usage(appname, output): build_man = True if o == '--pdf': build_pdf = True + if o == '--all': + allowContrib = True if not args: print("error: build directory not specified\n", file=sys.stderr) @@ -997,7 +999,7 @@ def print_usage(appname, output): bindings_options += "\n.. _%s-%s-%s-label:\n\n" % ( app_name, cat, name) bindings_options += "%s\n" % name - bindings_options += "%s\n\n" % ('^'*len(name)) + bindings_options += "%s\n\n" % ('-'*len(name)) desc = xml_desc_lines(b) if len(desc) > 0: bindings_options += "\n".join(desc)