Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3621 from msimberg/update-docs-copyright-year
Update copyright year and other small formatting fixes
  • Loading branch information
msimberg committed Jan 18, 2019
2 parents e524c39 + a1ecbb5 commit d1b15c8
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions 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)
Expand Down Expand Up @@ -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
<https://pgp.mit.edu/pks/lookup?op=get&search=0xE18AE35E86BB194F)>`_.
`here
<https://pgp.mit.edu/pks/lookup?op=get&search=0xE18AE35E86BB194F>`_.

Citing
======
Expand Down
2 changes: 1 addition & 1 deletion cmake/HPX_AddDefinitions.cmake
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmake/packaging/rpm/CMakeLists.txt
Expand Up @@ -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)")
Expand Down
4 changes: 2 additions & 2 deletions cmake/templates/conf.py.in
Expand Up @@ -375,8 +375,8 @@ master_doc = 'index'

# General information about the project.
project = u'HPX'
copyright = u'2008-2018, 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
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/additional_material.rst
Expand Up @@ -15,4 +15,4 @@ Additional material
* `Recorded lectures <https://www.youtube.com/playlist?list=PL1tk5lGm7zvSXfS-sqOOmIJ0lFNjKze18>`_
* `Slides <https://github.com/STEllAR-GROUP/tutorials/tree/master/cscs2016>`_
* `Tutorials repository <https://github.com/STEllAR-GROUP/tutorials>`_
* `Ste||ar group blog posts <http://stellar-group.org/blog/>`_
* `STE||AR Group blog posts <http://stellar-group.org/blog/>`_
2 changes: 1 addition & 1 deletion docs/sphinx/contributing/release_procedure.rst
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Expand Up @@ -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"
Expand Down

0 comments on commit d1b15c8

Please sign in to comment.