From be7ba0e81b558b8d22b1d2ed25d7d7289c12804b Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 17 Jan 2019 13:13:17 +0100 Subject: [PATCH 1/3] Update copyright year to 2019 in docs, README.rst and version.cpp --- README.rst | 2 +- cmake/templates/conf.py.in | 2 +- src/version.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 05b7bd35ffd6..43216bb7bc01 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -.. Copyright (c) 2007-2018 Louisiana State University +.. Copyright (c) 2007-2019 Louisiana State University Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in index e212fd80a3e0..2200886b1d9b 100644 --- a/cmake/templates/conf.py.in +++ b/cmake/templates/conf.py.in @@ -375,7 +375,7 @@ master_doc = 'index' # General information about the project. project = u'HPX' -copyright = u'2008-2018, The Ste||ar Group' +copyright = u'2008-2019, The Ste||ar Group' author = u'The Ste||ar Group' # The version info for the project you're documenting, acts as replacement for diff --git a/src/version.cpp b/src/version.cpp index 9427eff80ca5..1e93e3a065ac 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -106,7 +106,7 @@ namespace hpx "(A general purpose parallel C++ runtime system for distributed " "applications\n" "of any scale).\n\n" - "Copyright (c) 2007-2018, The STE||AR Group,\n" + "Copyright (c) 2007-2019, The STE||AR Group,\n" "http://stellar-group.org, email:hpx-users@stellar.cct.lsu.edu\n\n" "Distributed under the Boost Software License, " "Version 1.0. (See accompanying\n" From ef6546366c4a96941f3cf23230e6b599818c829e Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 17 Jan 2019 13:30:36 +0100 Subject: [PATCH 2/3] Change Ste||ar to STE||AR for consistency --- cmake/HPX_AddDefinitions.cmake | 2 +- cmake/packaging/rpm/CMakeLists.txt | 2 +- cmake/templates/conf.py.in | 4 ++-- docs/sphinx/additional_material.rst | 2 +- docs/sphinx/contributing/release_procedure.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/HPX_AddDefinitions.cmake b/cmake/HPX_AddDefinitions.cmake index 346231465e12..951fed5107c4 100644 --- a/cmake/HPX_AddDefinitions.cmake +++ b/cmake/HPX_AddDefinitions.cmake @@ -111,7 +111,7 @@ function(write_config_defines_file) if (NOT OPTION_TEMPLATE) string(TOUPPER ${OPTION_NAMESPACE} NAMESPACE_UPPER) set(PREAMBLE - "// Copyright (c) Ste||ar Group\n" + "// Copyright (c) STE||AR Group\n" "//\n" "// Distributed under the Boost Software License, Version 1.0. (See accompanying\n" "// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n" diff --git a/cmake/packaging/rpm/CMakeLists.txt b/cmake/packaging/rpm/CMakeLists.txt index c773a464a5e1..b815c59ddeb9 100644 --- a/cmake/packaging/rpm/CMakeLists.txt +++ b/cmake/packaging/rpm/CMakeLists.txt @@ -8,7 +8,7 @@ set(CPACK_GENERATOR "RPM") set(CPACK_PACKAGE_NAME "hpx") set(CPACK_PACKAGE_RELEASE 1) set(CPACK_PACKAGE_CONTACT "contact@stellar-group.org") -set(CPACK_PACKAGE_VENDOR "Ste||ar group") +set(CPACK_PACKAGE_VENDOR "STE||AR Group") set(CPACK_RPM_PACKAGE_LICENSE "BSL-1.0") set(CPACK_RPM_PACKAGE_URL "https://github.com/STEllAR-GROUP/hpx") set(CPACK_RPM_PACKAGE_SUMMARY "The C++ Standard Library for Parallelism and Concurrency (HPX)") diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in index 2200886b1d9b..4df14a7060b0 100644 --- a/cmake/templates/conf.py.in +++ b/cmake/templates/conf.py.in @@ -375,8 +375,8 @@ master_doc = 'index' # General information about the project. project = u'HPX' -copyright = u'2008-2019, The Ste||ar Group' -author = u'The Ste||ar Group' +copyright = u'2008-2019, The STE||AR Group' +author = u'The STE||AR Group' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/sphinx/additional_material.rst b/docs/sphinx/additional_material.rst index 152707607fac..f8c831e2eedb 100644 --- a/docs/sphinx/additional_material.rst +++ b/docs/sphinx/additional_material.rst @@ -15,4 +15,4 @@ Additional material * `Recorded lectures `_ * `Slides `_ * `Tutorials repository `_ -* `Ste||ar group blog posts `_ +* `STE||AR Group blog posts `_ diff --git a/docs/sphinx/contributing/release_procedure.rst b/docs/sphinx/contributing/release_procedure.rst index f80bb8c6b252..414d3fb9f25b 100644 --- a/docs/sphinx/contributing/release_procedure.rst +++ b/docs/sphinx/contributing/release_procedure.rst @@ -139,7 +139,7 @@ are completed to avoid confusion. ``contact@stellar-group.org`` key by adding the ``-s`` flag to ``git tag``. Make sure you change git to sign with the ``contact@stellar-group.org`` key, rather than your own key if you use one. You also need to change the name and - email used for commits. Change them to ``Ste||ar Group`` and + email used for commits. Change them to ``STE||AR Group`` and ``contact@stellar-group.org``, respectively. Finally, the ``contact@stellar-group.org`` email address needs to be added to your GitHub account for the tag to show up as verified. From a1ecbb5b9f26497c339608697619adfcd0600627 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Thu, 17 Jan 2019 13:34:54 +0100 Subject: [PATCH 3/3] Remove extra ) from PGP key link --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 43216bb7bc01..1d206df3ada1 100644 --- a/README.rst +++ b/README.rst @@ -107,8 +107,8 @@ about the expectations for members of our community, with regard to how they will behave toward each other. Please find the project's gpg key, which is used to sign HPX releases -`here -`_. +`here +`_. Citing ======