[PATCH 1/3] Use standard format for copyright lines

Wed Jan 9 15:14:04 UTC 2019

---
 bsp-howto/ada95_interrupt.rst                  |  3 +--
 bsp-howto/ata.rst                              |  3 +--
 bsp-howto/clock.rst                            |  3 +--
 bsp-howto/console.rst                          |  3 +--
 bsp-howto/frame_buffer.rst                     |  3 +--
 bsp-howto/getentropy.rst                       |  2 +-
 bsp-howto/i2c.rst                              |  2 +-
 bsp-howto/ide_controller.rst                   |  3 +--
 bsp-howto/initilization_code.rst               |  3 +--
 bsp-howto/linker_script.rst                    |  3 +--
 bsp-howto/miscellanous_support.rst             |  3 +--
 bsp-howto/networking.rst                       |  3 +--
 bsp-howto/preface.rst                          |  3 +--
 bsp-howto/real_time_clock.rst                  |  3 +--
 bsp-howto/shared_memory_support.rst            |  3 +--
 bsp-howto/spi.rst                              |  2 +-
 bsp-howto/target_dependant_files.rst           |  3 +--
 bsp-howto/timer.rst                            |  3 +--
 c-user/ada_support.rst                         |  3 +--
 c-user/barrier_manager.rst                     |  2 +-
 c-user/board_support_packages.rst              |  3 +--
 c-user/chains.rst                              |  2 +-
 c-user/clock_manager.rst                       |  3 +--
 c-user/configuring_a_system.rst                |  3 +--
 c-user/constant_bandwidth_server.rst           |  3 +--
 c-user/cpu_usage_statistics.rst                |  3 +--
 c-user/directive_status_codes.rst              |  2 +-
 c-user/dual_ports_memory_manager.rst           |  3 +--
 c-user/event_manager.rst                       |  3 +--
 c-user/example_application.rst                 |  3 +--
 c-user/fatal_error.rst                         |  3 +--
 c-user/initialization.rst                      |  3 +--
 c-user/interrupt_manager.rst                   |  3 +--
 c-user/io_manager.rst                          |  3 +--
 c-user/key_concepts.rst                        |  3 +--
 c-user/linker_sets.rst                         |  3 +--
 c-user/message_manager.rst                     |  3 +--
 c-user/multiprocessing.rst                     |  3 +--
 c-user/object_services.rst                     |  3 +--
 c-user/overview.rst                            |  3 +--
 c-user/partition_manager.rst                   |  3 +--
 c-user/pci_library.rst                         |  3 +--
 c-user/preface.rst                             |  3 +--
 c-user/rate_monotonic_manager.rst              |  5 ++---
 c-user/red_black_trees.rst                     |  3 +--
 c-user/region_manager.rst                      |  3 +--
 c-user/rtems_data_types.rst                    |  3 +--
 c-user/scheduling_concepts.rst                 |  3 +--
 c-user/self_contained_objects.rst              |  2 +-
 c-user/semaphore_manager.rst                   |  3 +--
 c-user/signal_manager.rst                      |  3 +--
 c-user/stack_bounds_checker.rst                |  3 +--
 c-user/symmetric_multiprocessing_services.rst  |  4 ++--
 c-user/task_manager.rst                        |  3 +--
 c-user/timer_manager.rst                       |  3 +--
 c-user/timespec_helpers.rst                    |  2 +-
 c-user/user_extensions.rst                     |  3 +--
 cpu-supplement/altera_nios_ii.rst              |  2 +-
 cpu-supplement/arm.rst                         |  3 +--
 cpu-supplement/atmel_avr.rst                   |  3 +--
 cpu-supplement/blackfin.rst                    |  2 +-
 cpu-supplement/ephiphany.rst                   |  3 +--
 cpu-supplement/intel_amd_x86.rst               |  3 +--
 cpu-supplement/lattice_micro32.rst             |  2 +-
 cpu-supplement/m68xxx_and_coldfire.rst         |  2 +-
 cpu-supplement/mips.rst                        |  2 +-
 cpu-supplement/openrisc_1000.rst               |  3 +--
 cpu-supplement/port.rst                        |  3 +--
 cpu-supplement/powerpc.rst                     |  3 +--
 cpu-supplement/preface.rst                     |  3 +--
 cpu-supplement/renesas_m32c.rst                |  3 +--
 cpu-supplement/riscv.rst                       |  3 +--
 cpu-supplement/sparc.rst                       |  3 +--
 cpu-supplement/sparc64.rst                     |  3 +--
 cpu-supplement/superh.rst                      |  3 +--
 cpu-supplement/xilinx_microblaze.rst           |  3 +--
 develenv/directory.rst                         |  3 +--
 develenv/introduction.rst                      |  3 +--
 eclipse/index.rst                              |  2 +-
 eclipse/overview.rst                           |  2 +-
 eclipse/rtems.rst                              |  2 +-
 eng/appendix-a.rst                             |  2 +-
 eng/change-management.rst                      |  2 +-
 eng/change-reports.rst                         |  2 +-
 eng/coding-80cols.rst                          |  2 +-
 eng/coding-conventions.rst                     |  2 +-
 eng/coding-deprecating.rst                     |  2 +-
 eng/coding-doxygen-bsp.rst                     |  2 +-
 eng/coding-doxygen.rst                         |  2 +-
 eng/coding-file-hdr.rst                        |  2 +-
 eng/coding-gen-patch.rst                       |  2 +-
 eng/coding-naming.rst                          |  2 +-
 eng/coding.rst                                 |  2 +-
 eng/index.rst                                  |  8 +++-----
 eng/issue-tracking.rst                         |  2 +-
 eng/license-requirements.rst                   |  2 +-
 eng/management.rst                             |  2 +-
 eng/preface.rst                                |  2 +-
 eng/prequalification.rst                       |  6 ++----
 eng/release-mgmt.rst                           |  2 +-
 eng/stakeholders.rst                           |  2 +-
 eng/test-plan.rst                              |  2 +-
 eng/test-suites.rst                            |  2 +-
 eng/tester.rst                                 |  2 +-
 eng/users-manuals.rst                          |  2 +-
 eng/vc-authors.rst                             |  2 +-
 eng/vc-users.rst                               |  2 +-
 eng/vdd-generation.rst                         |  2 +-
 eng/why-contribute.rst                         |  2 +-
 filesystem/call_development.rst                |  3 +--
 filesystem/fileystem_implmentation.rst         |  3 +--
 filesystem/in-memory.rst                       |  3 +--
 filesystem/minature_in-memory.rst              |  3 +--
 filesystem/mounting_and_unmounting.rst         |  3 +--
 filesystem/pathname_eval.rst                   |  3 +--
 filesystem/preface.rst                         |  3 +--
 filesystem/system_init.rst                     |  3 +--
 networking/network_task_structure.rst          |  3 +--
 networking/networking_driver.rst               |  3 +--
 networking/preface.rst                         |  3 +--
 networking/testing_the_driver.rst              |  3 +--
 networking/using_networking_rtems_app.rst      |  3 +--
 porting/code_tuning.rst                        |  3 +--
 porting/cpu_init.rst                           |  3 +--
 porting/cpu_model_variations.rst               |  3 +--
 porting/development_tools.rst                  |  3 +--
 porting/idle_thread.rst                        |  3 +--
 porting/interrupts.rst                         |  3 +--
 porting/preface.rst                            |  3 +--
 porting/priority_bitmap.rst                    |  3 +--
 porting/source_code_org.rst                    |  3 +--
 porting/task_context.rst                       |  3 +--
 posix-compliance/preface.rst                   |  3 +--
 posix-compliance/standards.rst                 |  2 +-
 posix-users/condition_variable.rst             |  3 +--
 posix-users/devctl.rst                         |  3 +--
 posix-users/device_and_class_specific.rst      |  3 +--
 posix-users/files_and_directory.rst            |  3 +--
 posix-users/input_and_output.rst               |  3 +--
 posix-users/key.rst                            |  3 +--
 posix-users/language_specific_services.rst     |  3 +--
 posix-users/memory_managment.rst               |  3 +--
 posix-users/message_passing.rst                |  3 +--
 posix-users/mutex.rst                          |  3 +--
 posix-users/preface.rst                        |  3 +--
 posix-users/process_creation_and_execution.rst |  3 +--
 posix-users/process_environment.rst            |  3 +--
 posix-users/scheduler.rst                      |  3 +--
 posix-users/semaphore.rst                      |  3 +--
 posix-users/services_provided_by_c.rst         |  3 +--
 posix-users/services_provided_by_math.rst      | 10 +++-------
 posix-users/signal.rst                         |  3 +--
 posix-users/system_database.rst                |  3 +--
 posix-users/thread.rst                         |  3 +--
 posix-users/thread_cancellation.rst            |  3 +--
 posix-users/timer.rst                          |  3 +--
 rsb/bug-reporting.rst                          |  3 +--
 rsb/building-tools-and-rtems.rst               |  3 +--
 rsb/commands.rst                               |  3 +--
 rsb/configuration.rst                          |  3 +--
 rsb/cross-canadian-cross.rst                   |  3 +--
 rsb/project-sets.rst                           |  3 +--
 rsb/source-builder.rst                         |  3 +--
 rsb/third-party-packages.rst                   |  3 +--
 shell/concept.rst                              |  3 +--
 shell/configuration_and_init.rst               |  3 +--
 shell/file_and_directory.rst                   |  3 +--
 shell/function_and_variable.rst                |  3 +--
 shell/general_commands.rst                     |  3 +--
 shell/index.rst                                |  3 +--
 shell/memory_commands.rst                      |  3 +--
 shell/network_commands.rst                     |  3 +--
 shell/preface.rst                              |  3 +--
 shell/rtems_specific_commands.rst              |  3 +--
 user/apps/index.rst                            |  2 +-
 user/bsps/bsps-aarch64.rst                     |  3 ++-
 user/bsps/bsps-arm.rst                         |  3 ++-
 user/bsps/bsps-bfin.rst                        |  3 ++-
 user/bsps/bsps-epiphany.rst                    |  3 ++-
 user/bsps/bsps-i386.rst                        |  3 ++-
 user/bsps/bsps-lm32.rst                        |  3 ++-
 user/bsps/bsps-m68k.rst                        |  3 ++-
 user/bsps/bsps-microblaze.rst                  |  3 ++-
 user/bsps/bsps-mips.rst                        |  3 ++-
 user/bsps/bsps-moxie.rst                       |  3 ++-
 user/bsps/bsps-nios2.rst                       |  3 ++-
 user/bsps/bsps-or1k.rst                        |  3 ++-
 user/bsps/bsps-powerpc.rst                     |  3 ++-
 user/bsps/bsps-riscv.rst                       |  3 ++-
 user/bsps/bsps-sh.rst                          |  3 ++-
 user/bsps/bsps-sparc.rst                       |  3 ++-
 user/bsps/bsps-sparc64.rst                     |  3 ++-
 user/bsps/bsps-v850.rst                        |  3 ++-
 user/bsps/bsps-x86_64.rst                      |  5 +++--
 user/bsps/index.rst                            |  2 +-
 user/ecosys/index.rst                          |  2 +-
 user/exe/debugging.rst                         |  2 +-
 user/exe/executables.rst                       |  2 +-
 user/exe/execution.rst                         |  2 +-
 user/exe/index.rst                             |  2 +-
 user/exe/initialization.rst                    |  2 +-
 user/hardware/architectures.rst                |  2 +-
 user/hardware/bsps.rst                         |  2 +-
 user/hardware/index.rst                        |  2 +-
 user/hardware/targets.rst                      |  2 +-
 user/hardware/tiers.rst                        |  2 +-
 user/hosts/index.rst                           |  2 +-
 user/hosts/macos.rst                           |  2 +-
 user/hosts/os.rst                              |  2 +-
 user/hosts/posix.rst                           |  2 +-
 user/hosts/windows.rst                         |  2 +-
 user/installation/developer.rst                |  2 +-
 user/installation/index.rst                    |  2 +-
 user/installation/kernel.rst                   |  2 +-
 user/installation/prefixes-sandboxing.rst      |  2 +-
 user/installation/releases.rst                 |  2 +-
 user/start/index.rst                           |  2 +-
 user/testing/configuration.rst                 |  2 +-
 user/testing/consoles.rst                      |  2 +-
 user/testing/gdb-jtag.rst                      |  2 +-
 user/testing/index.rst                         |  2 +-
 user/testing/simulation.rst                    |  2 +-
 user/testing/tests.rst                         |  2 +-
 user/testing/tftp.rst                          |  2 +-
 user/tools/bsp-builder.rst                     |  2 +-
 user/tools/exeinfo.rst                         |  2 +-
 user/tools/index.rst                           |  2 +-
 user/tools/linker.rst                          |  2 +-
 user/tools/symbols.rst                         |  2 +-
 user/tools/tester.rst                          |  2 +-
 user/tracing/captureengine.rst                 |  2 +-
 user/tracing/examples.rst                      |  2 +-
 user/tracing/index.rst                         |  2 +-
 user/tracing/introduction.rst                  |  2 +-
 user/tracing/tracelinker.rst                   |  2 +-
 235 files changed, 262 insertions(+), 378 deletions(-)

diff --git a/bsp-howto/ada95_interrupt.rst b/bsp-howto/ada95_interrupt.rst
index 08832d1..748ee74 100644
--- a/bsp-howto/ada95_interrupt.rst
+++ b/bsp-howto/ada95_interrupt.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Ada95 Interrupt Support
diff --git a/bsp-howto/ata.rst b/bsp-howto/ata.rst
index 7e7e2e8..a1b9700 100644
--- a/bsp-howto/ata.rst
+++ b/bsp-howto/ata.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 ATA Driver
diff --git a/bsp-howto/clock.rst b/bsp-howto/clock.rst
index 326ad6c..26ce1d6 100644
--- a/bsp-howto/clock.rst
+++ b/bsp-howto/clock.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Clock Driver
diff --git a/bsp-howto/console.rst b/bsp-howto/console.rst
index 5916cf7..2ae9b53 100644
--- a/bsp-howto/console.rst
+++ b/bsp-howto/console.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Console Driver
diff --git a/bsp-howto/frame_buffer.rst b/bsp-howto/frame_buffer.rst
index 5f74712..4cd253e 100644
--- a/bsp-howto/frame_buffer.rst
+++ b/bsp-howto/frame_buffer.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Frame Buffer Driver
diff --git a/bsp-howto/getentropy.rst b/bsp-howto/getentropy.rst
index 840ba1e..c7c6a62 100644
--- a/bsp-howto/getentropy.rst
+++ b/bsp-howto/getentropy.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2017 embedded brains GmbH <rtems at embedded-brains.de>
+.. Copyright (C) 2017 embedded brains GmbH <rtems at embedded-brains.de>
 .. COMMENT: All rights reserved.
 
 Entropy Source
diff --git a/bsp-howto/i2c.rst b/bsp-howto/i2c.rst
index db21486..e254ab0 100644
--- a/bsp-howto/i2c.rst
+++ b/bsp-howto/i2c.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2016 embedded brains GmbH <rtems at embedded-brains.de>
+.. Copyright (C) 2016 embedded brains GmbH <rtems at embedded-brains.de>
 .. COMMENT: All rights reserved.
 
 I2C Driver
diff --git a/bsp-howto/ide_controller.rst b/bsp-howto/ide_controller.rst
index a6e4cc3..04f518a 100644
--- a/bsp-howto/ide_controller.rst
+++ b/bsp-howto/ide_controller.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 IDE Controller Driver
diff --git a/bsp-howto/initilization_code.rst b/bsp-howto/initilization_code.rst
index c77175c..2304d43 100644
--- a/bsp-howto/initilization_code.rst
+++ b/bsp-howto/initilization_code.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Initialization Code
diff --git a/bsp-howto/linker_script.rst b/bsp-howto/linker_script.rst
index c00d205..43c2c60 100644
--- a/bsp-howto/linker_script.rst
+++ b/bsp-howto/linker_script.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 
-.. COMMENT: COPYRIGHT (c) 1988-2011.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2011 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Linker Script
diff --git a/bsp-howto/miscellanous_support.rst b/bsp-howto/miscellanous_support.rst
index de15000..2dba828 100644
--- a/bsp-howto/miscellanous_support.rst
+++ b/bsp-howto/miscellanous_support.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Miscellaneous Support Files
diff --git a/bsp-howto/networking.rst b/bsp-howto/networking.rst
index e95bb28..2d5b6de 100644
--- a/bsp-howto/networking.rst
+++ b/bsp-howto/networking.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Networking Driver
diff --git a/bsp-howto/preface.rst b/bsp-howto/preface.rst
index 9ce1128..9cb5507 100644
--- a/bsp-howto/preface.rst
+++ b/bsp-howto/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Introduction
diff --git a/bsp-howto/real_time_clock.rst b/bsp-howto/real_time_clock.rst
index 1a9069e..bc90bfa 100644
--- a/bsp-howto/real_time_clock.rst
+++ b/bsp-howto/real_time_clock.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Real-Time Clock Driver
diff --git a/bsp-howto/shared_memory_support.rst b/bsp-howto/shared_memory_support.rst
index 332e4b6..8d572ca 100644
--- a/bsp-howto/shared_memory_support.rst
+++ b/bsp-howto/shared_memory_support.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2009.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2009 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Shared Memory Support Driver
diff --git a/bsp-howto/spi.rst b/bsp-howto/spi.rst
index 0f3e9cf..9a19803 100644
--- a/bsp-howto/spi.rst
+++ b/bsp-howto/spi.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2016 embedded brains GmbH <rtems at embedded-brains.de>
+.. Copyright (C) 2016 embedded brains GmbH <rtems at embedded-brains.de>
 .. COMMENT: All rights reserved.
 
 SPI Driver
diff --git a/bsp-howto/target_dependant_files.rst b/bsp-howto/target_dependant_files.rst
index 20fdd97..4b1b439 100644
--- a/bsp-howto/target_dependant_files.rst
+++ b/bsp-howto/target_dependant_files.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 
diff --git a/bsp-howto/timer.rst b/bsp-howto/timer.rst
index b5e6bb6..c1b86b8 100644
--- a/bsp-howto/timer.rst
+++ b/bsp-howto/timer.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Timer Driver
diff --git a/c-user/ada_support.rst b/c-user/ada_support.rst
index 7353e8a..11e6129 100644
--- a/c-user/ada_support.rst
+++ b/c-user/ada_support.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2017.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2017 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: Ada
diff --git a/c-user/barrier_manager.rst b/c-user/barrier_manager.rst
index 636973c..5124998 100644
--- a/c-user/barrier_manager.rst
+++ b/c-user/barrier_manager.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008, 2018.
+.. Copyright (C) 1988, 2008, 2018.
 .. COMMENT: On-Line Applications Research Corporation (OAR).
 .. COMMENT: All rights reserved.
 
diff --git a/c-user/board_support_packages.rst b/c-user/board_support_packages.rst
index 333efd5..2a19eef 100644
--- a/c-user/board_support_packages.rst
+++ b/c-user/board_support_packages.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: Board Support Packages
diff --git a/c-user/chains.rst b/c-user/chains.rst
index 0abcd2b..defc400 100644
--- a/c-user/chains.rst
+++ b/c-user/chains.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright 2014 Gedare Bloom.
+.. Copyright (C) 2014 Gedare Bloom
 .. COMMENT: All rights reserved.
 
 .. index:: chains
diff --git a/c-user/clock_manager.rst b/c-user/clock_manager.rst
index 3d41064..4e329e2 100644
--- a/c-user/clock_manager.rst
+++ b/c-user/clock_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: clock
diff --git a/c-user/configuring_a_system.rst b/c-user/configuring_a_system.rst
index 601c4a1..b15519e 100644
--- a/c-user/configuring_a_system.rst
+++ b/c-user/configuring_a_system.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: configuring a system
diff --git a/c-user/constant_bandwidth_server.rst b/c-user/constant_bandwidth_server.rst
index 2b03475..615ce62 100644
--- a/c-user/constant_bandwidth_server.rst
+++ b/c-user/constant_bandwidth_server.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2011.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2011 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: cbs
diff --git a/c-user/cpu_usage_statistics.rst b/c-user/cpu_usage_statistics.rst
index 98bdc1c..58f5cdb 100644
--- a/c-user/cpu_usage_statistics.rst
+++ b/c-user/cpu_usage_statistics.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: CPU Usage
diff --git a/c-user/directive_status_codes.rst b/c-user/directive_status_codes.rst
index 41fc649..9d41f94 100644
--- a/c-user/directive_status_codes.rst
+++ b/c-user/directive_status_codes.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright 2015 embedded brains GmbH
+.. Copyright (C) 2015 embedded brains GmbH
 .. COMMENT: All rights reserved.
 
 .. index:: Status Codes
diff --git a/c-user/dual_ports_memory_manager.rst b/c-user/dual_ports_memory_manager.rst
index 1ca71d6..8e72648 100644
--- a/c-user/dual_ports_memory_manager.rst
+++ b/c-user/dual_ports_memory_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: ports
diff --git a/c-user/event_manager.rst b/c-user/event_manager.rst
index 3108984..38129a7 100644
--- a/c-user/event_manager.rst
+++ b/c-user/event_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: events
diff --git a/c-user/example_application.rst b/c-user/example_application.rst
index 8a030fd..d661f67 100644
--- a/c-user/example_application.rst
+++ b/c-user/example_application.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2011.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2011 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Example Application
diff --git a/c-user/fatal_error.rst b/c-user/fatal_error.rst
index 305de23..cd8c8f8 100644
--- a/c-user/fatal_error.rst
+++ b/c-user/fatal_error.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: fatal errors
diff --git a/c-user/initialization.rst b/c-user/initialization.rst
index 0a59863..1088e16 100644
--- a/c-user/initialization.rst
+++ b/c-user/initialization.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Initialization Manager
diff --git a/c-user/interrupt_manager.rst b/c-user/interrupt_manager.rst
index 2734f17..30799c3 100644
--- a/c-user/interrupt_manager.rst
+++ b/c-user/interrupt_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: interrupts
diff --git a/c-user/io_manager.rst b/c-user/io_manager.rst
index 208fd9c..cfa77ba 100644
--- a/c-user/io_manager.rst
+++ b/c-user/io_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: device drivers
diff --git a/c-user/key_concepts.rst b/c-user/key_concepts.rst
index 25f9249..b0c070c 100644
--- a/c-user/key_concepts.rst
+++ b/c-user/key_concepts.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Key Concepts
diff --git a/c-user/linker_sets.rst b/c-user/linker_sets.rst
index 9b2f1ca..87d5c9a 100644
--- a/c-user/linker_sets.rst
+++ b/c-user/linker_sets.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2014.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2014 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: linkersets
diff --git a/c-user/message_manager.rst b/c-user/message_manager.rst
index b1af878..2704a85 100644
--- a/c-user/message_manager.rst
+++ b/c-user/message_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: messages
diff --git a/c-user/multiprocessing.rst b/c-user/multiprocessing.rst
index 4528bcf..4d3a9c8 100644
--- a/c-user/multiprocessing.rst
+++ b/c-user/multiprocessing.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: multiprocessing
diff --git a/c-user/object_services.rst b/c-user/object_services.rst
index dbe61d3..78e203d 100644
--- a/c-user/object_services.rst
+++ b/c-user/object_services.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: object manipulation
diff --git a/c-user/overview.rst b/c-user/overview.rst
index 04ba4b3..2c804a3 100644
--- a/c-user/overview.rst
+++ b/c-user/overview.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Overview
diff --git a/c-user/partition_manager.rst b/c-user/partition_manager.rst
index 09dd054..9b0ba11 100644
--- a/c-user/partition_manager.rst
+++ b/c-user/partition_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: partitions
diff --git a/c-user/pci_library.rst b/c-user/pci_library.rst
index 736888d..7b8ae13 100644
--- a/c-user/pci_library.rst
+++ b/c-user/pci_library.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2011,2015
-.. COMMENT: Aeroflex Gaisler AB
+.. Copyright (C) 2011,2015 Aeroflex Gaisler AB
 .. COMMENT: All rights reserved.
 
 .. index:: PCI
diff --git a/c-user/preface.rst b/c-user/preface.rst
index cd02fb9..0305abe 100644
--- a/c-user/preface.rst
+++ b/c-user/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/c-user/rate_monotonic_manager.rst b/c-user/rate_monotonic_manager.rst
index eeb1ec6..4899404 100644
--- a/c-user/rate_monotonic_manager.rst
+++ b/c-user/rate_monotonic_manager.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
-.. COMMENT: COPYRIGHT (c) 2017 Kuan-Hsun Chen.
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
+.. Copyright (C) 2017 Kuan-Hsun Chen.
 .. COMMENT: All rights reserved.
 
 .. index:: rate mononitonic tasks
diff --git a/c-user/red_black_trees.rst b/c-user/red_black_trees.rst
index bac16d1..eb7544d 100644
--- a/c-user/red_black_trees.rst
+++ b/c-user/red_black_trees.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2012.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2012 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: Red-Black Trees
diff --git a/c-user/region_manager.rst b/c-user/region_manager.rst
index 6a894d7..cdf23c2 100644
--- a/c-user/region_manager.rst
+++ b/c-user/region_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: regions
diff --git a/c-user/rtems_data_types.rst b/c-user/rtems_data_types.rst
index b277110..94567e9 100644
--- a/c-user/rtems_data_types.rst
+++ b/c-user/rtems_data_types.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: RTEMS Data Types
diff --git a/c-user/scheduling_concepts.rst b/c-user/scheduling_concepts.rst
index 5a2ce05..bd97006 100644
--- a/c-user/scheduling_concepts.rst
+++ b/c-user/scheduling_concepts.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: scheduling
diff --git a/c-user/self_contained_objects.rst b/c-user/self_contained_objects.rst
index 28c9839..53e53ae 100644
--- a/c-user/self_contained_objects.rst
+++ b/c-user/self_contained_objects.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2014, 2017.
+.. Copyright (C) 2014, 2017.
 .. COMMENT: embedded brains GmbH.
 .. COMMENT: All rights reserved.
 
diff --git a/c-user/semaphore_manager.rst b/c-user/semaphore_manager.rst
index 695d75a..6b1a08e 100644
--- a/c-user/semaphore_manager.rst
+++ b/c-user/semaphore_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: semaphores
diff --git a/c-user/signal_manager.rst b/c-user/signal_manager.rst
index 5e233fd..baa1357 100644
--- a/c-user/signal_manager.rst
+++ b/c-user/signal_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: signals
diff --git a/c-user/stack_bounds_checker.rst b/c-user/stack_bounds_checker.rst
index 31ecf1d..bfcda2b 100644
--- a/c-user/stack_bounds_checker.rst
+++ b/c-user/stack_bounds_checker.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: Stack Bounds Checker
diff --git a/c-user/symmetric_multiprocessing_services.rst b/c-user/symmetric_multiprocessing_services.rst
index 3b2c3a5..2051577 100644
--- a/c-user/symmetric_multiprocessing_services.rst
+++ b/c-user/symmetric_multiprocessing_services.rst
@@ -1,8 +1,8 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2014.
+.. Copyright (C) 2014.
 .. COMMENT: On-Line Applications Research Corporation (OAR).
-.. COMMENT: Copyright (c) 2017 embedded brains GmbH.
+.. Copyright (C) 2017 embedded brains GmbH.
 .. COMMENT: All rights reserved.
 
 .. index:: Symmetric Multiprocessing
diff --git a/c-user/task_manager.rst b/c-user/task_manager.rst
index f48aa13..c0a5544 100644
--- a/c-user/task_manager.rst
+++ b/c-user/task_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: tasks
diff --git a/c-user/timer_manager.rst b/c-user/timer_manager.rst
index a1e5fd9..1f01726 100644
--- a/c-user/timer_manager.rst
+++ b/c-user/timer_manager.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: timers
diff --git a/c-user/timespec_helpers.rst b/c-user/timespec_helpers.rst
index e169809..b596664 100644
--- a/c-user/timespec_helpers.rst
+++ b/c-user/timespec_helpers.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2011.
+.. Copyright (C) 2011.
 .. COMMENT: On-Line Applications Research Corporation (OAR).
 .. COMMENT: All rights reserved.
 
diff --git a/c-user/user_extensions.rst b/c-user/user_extensions.rst
index 62fdfcf..b6896f6 100644
--- a/c-user/user_extensions.rst
+++ b/c-user/user_extensions.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 .. index:: user extensions
diff --git a/cpu-supplement/altera_nios_ii.rst b/cpu-supplement/altera_nios_ii.rst
index 8bc1a31..da37de2 100644
--- a/cpu-supplement/altera_nios_ii.rst
+++ b/cpu-supplement/altera_nios_ii.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2014 Hesham ALMatary <heshamelmatary at gmail.com>
+.. Copyright (C) 2014 Hesham ALMatary <heshamelmatary at gmail.com>
 .. COMMENT: All rights reserved.
 
 Altera Nios II Specific Information
diff --git a/cpu-supplement/arm.rst b/cpu-supplement/arm.rst
index a7a3742..fc80538 100644
--- a/cpu-supplement/arm.rst
+++ b/cpu-supplement/arm.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2009.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2009 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 ARM Specific Information
diff --git a/cpu-supplement/atmel_avr.rst b/cpu-supplement/atmel_avr.rst
index 838dafe..958adbf 100644
--- a/cpu-supplement/atmel_avr.rst
+++ b/cpu-supplement/atmel_avr.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2006.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2006 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Atmel AVR Specific Information
diff --git a/cpu-supplement/blackfin.rst b/cpu-supplement/blackfin.rst
index c959ddf..19b8299 100644
--- a/cpu-supplement/blackfin.rst
+++ b/cpu-supplement/blackfin.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2015 University of York.
+.. Copyright (C) 2015 University of York.
 .. COMMENT: Hesham ALMatary <hmka501 at york.ac.uk>
 
 Blackfin Specific Information
diff --git a/cpu-supplement/ephiphany.rst b/cpu-supplement/ephiphany.rst
index bbb0cf7..bbcd939 100644
--- a/cpu-supplement/ephiphany.rst
+++ b/cpu-supplement/ephiphany.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Epiphany Specific Information
diff --git a/cpu-supplement/intel_amd_x86.rst b/cpu-supplement/intel_amd_x86.rst
index 205ffa2..774ff0e 100644
--- a/cpu-supplement/intel_amd_x86.rst
+++ b/cpu-supplement/intel_amd_x86.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 .. COMMENT: Jukka Pietarinen <jukka.pietarinen at mrf.fi>, 2008,
 .. COMMENT: Micro-Research Finland Oy
diff --git a/cpu-supplement/lattice_micro32.rst b/cpu-supplement/lattice_micro32.rst
index ba3ab9d..2fbeb1d 100644
--- a/cpu-supplement/lattice_micro32.rst
+++ b/cpu-supplement/lattice_micro32.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+.. Copyright (C) 2014 embedded brains GmbH.  All rights reserved.
 
 Lattice Mico32 Specific Information
 ***********************************
diff --git a/cpu-supplement/m68xxx_and_coldfire.rst b/cpu-supplement/m68xxx_and_coldfire.rst
index ffabdc0..080e084 100644
--- a/cpu-supplement/m68xxx_and_coldfire.rst
+++ b/cpu-supplement/m68xxx_and_coldfire.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+.. Copyright (C) 2014 embedded brains GmbH.  All rights reserved.
 
 M68xxx and Coldfire Specific Information
 ****************************************
diff --git a/cpu-supplement/mips.rst b/cpu-supplement/mips.rst
index 29befb3..421b2cb 100644
--- a/cpu-supplement/mips.rst
+++ b/cpu-supplement/mips.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+.. Copyright (C) 2014 embedded brains GmbH.  All rights reserved.
 
 MIPS Specific Information
 *************************
diff --git a/cpu-supplement/openrisc_1000.rst b/cpu-supplement/openrisc_1000.rst
index 3d9e12b..ac3e30c 100644
--- a/cpu-supplement/openrisc_1000.rst
+++ b/cpu-supplement/openrisc_1000.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2007.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2007 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 OpenRISC 1000 Specific Information
diff --git a/cpu-supplement/port.rst b/cpu-supplement/port.rst
index bf1de3e..f61e328 100644
--- a/cpu-supplement/port.rst
+++ b/cpu-supplement/port.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Port Specific Information
diff --git a/cpu-supplement/powerpc.rst b/cpu-supplement/powerpc.rst
index 8606277..2c630f2 100644
--- a/cpu-supplement/powerpc.rst
+++ b/cpu-supplement/powerpc.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 PowerPC Specific Information
diff --git a/cpu-supplement/preface.rst b/cpu-supplement/preface.rst
index 1e6f4b5..a363e1a 100644
--- a/cpu-supplement/preface.rst
+++ b/cpu-supplement/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/cpu-supplement/renesas_m32c.rst b/cpu-supplement/renesas_m32c.rst
index 0060c9c..f07042f 100644
--- a/cpu-supplement/renesas_m32c.rst
+++ b/cpu-supplement/renesas_m32c.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Renesas M32C Specific Information
diff --git a/cpu-supplement/riscv.rst b/cpu-supplement/riscv.rst
index 9ed5e32..a19723d 100644
--- a/cpu-supplement/riscv.rst
+++ b/cpu-supplement/riscv.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: Copyright (c) 2018
-.. COMMENT: embedded brains GmbH
+.. Copyright (C) 2018 embedded brains GmbH
 .. COMMENT: All rights reserved.
 
 RISC-V Specific Information
diff --git a/cpu-supplement/sparc.rst b/cpu-supplement/sparc.rst
index 45b4b40..3e8cfd8 100644
--- a/cpu-supplement/sparc.rst
+++ b/cpu-supplement/sparc.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 SPARC Specific Information
diff --git a/cpu-supplement/sparc64.rst b/cpu-supplement/sparc64.rst
index 753e714..2e326b8 100644
--- a/cpu-supplement/sparc64.rst
+++ b/cpu-supplement/sparc64.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 SPARC-64 Specific Information
diff --git a/cpu-supplement/superh.rst b/cpu-supplement/superh.rst
index 2df9a08..2c1c2f4 100644
--- a/cpu-supplement/superh.rst
+++ b/cpu-supplement/superh.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 SuperH Specific Information
diff --git a/cpu-supplement/xilinx_microblaze.rst b/cpu-supplement/xilinx_microblaze.rst
index a04e558..f71955f 100644
--- a/cpu-supplement/xilinx_microblaze.rst
+++ b/cpu-supplement/xilinx_microblaze.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Xilinx MicroBlaze Specific Information
diff --git a/develenv/directory.rst b/develenv/directory.rst
index 08c58ad..8f9cf59 100644
--- a/develenv/directory.rst
+++ b/develenv/directory.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2007.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2007 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Directory Structure
diff --git a/develenv/introduction.rst b/develenv/introduction.rst
index 4a24a78..3707308 100644
--- a/develenv/introduction.rst
+++ b/develenv/introduction.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2010.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2010 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Introduction
diff --git a/eclipse/index.rst b/eclipse/index.rst
index 108941e..82f6ac1 100644
--- a/eclipse/index.rst
+++ b/eclipse/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. highlight:: c
diff --git a/eclipse/overview.rst b/eclipse/overview.rst
index 89dd3e1..327a495 100644
--- a/eclipse/overview.rst
+++ b/eclipse/overview.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _overview:
diff --git a/eclipse/rtems.rst b/eclipse/rtems.rst
index ff3c421..fc3c03a 100644
--- a/eclipse/rtems.rst
+++ b/eclipse/rtems.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _rtems-development:
diff --git a/eng/appendix-a.rst b/eng/appendix-a.rst
index 83a145e..73a0739 100644
--- a/eng/appendix-a.rst
+++ b/eng/appendix-a.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/change-management.rst b/eng/change-management.rst
index 3e6d30a..af202af 100644
--- a/eng/change-management.rst
+++ b/eng/change-management.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Change Management
diff --git a/eng/change-reports.rst b/eng/change-reports.rst
index 841bd04..dd9f333 100644
--- a/eng/change-reports.rst
+++ b/eng/change-reports.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/coding-80cols.rst b/eng/coding-80cols.rst
index 8fbe10d..1f789f4 100644
--- a/eng/coding-80cols.rst
+++ b/eng/coding-80cols.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Eighty Character Line Limit
diff --git a/eng/coding-conventions.rst b/eng/coding-conventions.rst
index b9ba7d2..623b603 100644
--- a/eng/coding-conventions.rst
+++ b/eng/coding-conventions.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 .. COMMENT:TBD  - Convert the following to Rest and insert into this file
diff --git a/eng/coding-deprecating.rst b/eng/coding-deprecating.rst
index 432efce..4a5ebbd 100644
--- a/eng/coding-deprecating.rst
+++ b/eng/coding-deprecating.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Deprectating Interfaces
diff --git a/eng/coding-doxygen-bsp.rst b/eng/coding-doxygen-bsp.rst
index 2ea82fd..192dc97 100644
--- a/eng/coding-doxygen-bsp.rst
+++ b/eng/coding-doxygen-bsp.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/coding-doxygen.rst b/eng/coding-doxygen.rst
index 9068074..0bc72bd 100644
--- a/eng/coding-doxygen.rst
+++ b/eng/coding-doxygen.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 General Doxygen Recommentations
diff --git a/eng/coding-file-hdr.rst b/eng/coding-file-hdr.rst
index 7104d06..c70b380 100644
--- a/eng/coding-file-hdr.rst
+++ b/eng/coding-file-hdr.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 .. COMMENT:TBD - Convert the following to Rest and insert into this file
diff --git a/eng/coding-gen-patch.rst b/eng/coding-gen-patch.rst
index 5f007d5..fa55f18 100644
--- a/eng/coding-gen-patch.rst
+++ b/eng/coding-gen-patch.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Generating a Tools Patch
diff --git a/eng/coding-naming.rst b/eng/coding-naming.rst
index 4fb4e7c..2207237 100644
--- a/eng/coding-naming.rst
+++ b/eng/coding-naming.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Naming Rules
diff --git a/eng/coding.rst b/eng/coding.rst
index 14223ba..2214461 100644
--- a/eng/coding.rst
+++ b/eng/coding.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Coding Standards
diff --git a/eng/index.rst b/eng/index.rst
index 81324e0..f309459 100644
--- a/eng/index.rst
+++ b/eng/index.rst
@@ -1,12 +1,10 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
-.. COMMENT: COPYRIGHT (c) 2016-2018.
-.. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
+.. Copyright (C) 2016, 2018 RTEMS Foundation, The RTEMS Documentation Project
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 
 ================================================
-RTEMS Software Engineering Handbook (|version|).
+RTEMS Software Engineering Handbook (|version|)
 ================================================
 
  | **COPYRIGHT (c) 1988 - 2015.**
diff --git a/eng/issue-tracking.rst b/eng/issue-tracking.rst
index 917b2ea..d9ea89d 100644
--- a/eng/issue-tracking.rst
+++ b/eng/issue-tracking.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Issue Tracking
diff --git a/eng/license-requirements.rst b/eng/license-requirements.rst
index 7fe3ff4..5f711fd 100644
--- a/eng/license-requirements.rst
+++ b/eng/license-requirements.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/management.rst b/eng/management.rst
index a71167a..fac6ca6 100644
--- a/eng/management.rst
+++ b/eng/management.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/preface.rst b/eng/preface.rst
index 562f61f..e017a85 100644
--- a/eng/preface.rst
+++ b/eng/preface.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Preface
diff --git a/eng/prequalification.rst b/eng/prequalification.rst
index 62e859e..20607c2 100644
--- a/eng/prequalification.rst
+++ b/eng/prequalification.rst
@@ -1,9 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
-.. COMMENT: COPYRIGHT (c) 2016-2018.
-.. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
+.. Copyright (C) 2016, 2018 RTEMS Foundation, The RTEMS Documentation Project
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 
 Introduction to Pre-Qualification
 *********************************
diff --git a/eng/release-mgmt.rst b/eng/release-mgmt.rst
index 276440c..0ce6d82 100644
--- a/eng/release-mgmt.rst
+++ b/eng/release-mgmt.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/stakeholders.rst b/eng/stakeholders.rst
index 51bd125..dc1e60e 100644
--- a/eng/stakeholders.rst
+++ b/eng/stakeholders.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 RTEMS Stakeholders
diff --git a/eng/test-plan.rst b/eng/test-plan.rst
index c992150..a1f576d 100644
--- a/eng/test-plan.rst
+++ b/eng/test-plan.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/test-suites.rst b/eng/test-suites.rst
index 94cd42e..fca9224 100644
--- a/eng/test-suites.rst
+++ b/eng/test-suites.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 Test Suites
diff --git a/eng/tester.rst b/eng/tester.rst
index 97893aa..6e14cae 100644
--- a/eng/tester.rst
+++ b/eng/tester.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 RTEMS Tester
diff --git a/eng/users-manuals.rst b/eng/users-manuals.rst
index a6010c0..b435882 100644
--- a/eng/users-manuals.rst
+++ b/eng/users-manuals.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/vc-authors.rst b/eng/vc-authors.rst
index 9fd80bd..5b4dece 100644
--- a/eng/vc-authors.rst
+++ b/eng/vc-authors.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/vc-users.rst b/eng/vc-users.rst
index 4220de3..4b484cb 100644
--- a/eng/vc-users.rst
+++ b/eng/vc-users.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/vdd-generation.rst b/eng/vdd-generation.rst
index 748c6e0..9dc8c57 100644
--- a/eng/vdd-generation.rst
+++ b/eng/vdd-generation.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/eng/why-contribute.rst b/eng/why-contribute.rst
index 619a255..6e933e4 100644
--- a/eng/why-contribute.rst
+++ b/eng/why-contribute.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: RTEMS Foundation, The RTEMS Documentation Project
 
 
diff --git a/filesystem/call_development.rst b/filesystem/call_development.rst
index 5875de4..51134b1 100644
--- a/filesystem/call_development.rst
+++ b/filesystem/call_development.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 System Call Development Notes
diff --git a/filesystem/fileystem_implmentation.rst b/filesystem/fileystem_implmentation.rst
index d40fe61..c4378fa 100644
--- a/filesystem/fileystem_implmentation.rst
+++ b/filesystem/fileystem_implmentation.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Filesystem Implementation Requirements
diff --git a/filesystem/in-memory.rst b/filesystem/in-memory.rst
index 937058b..60154c8 100644
--- a/filesystem/in-memory.rst
+++ b/filesystem/in-memory.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 In-Memory Filesystem
diff --git a/filesystem/minature_in-memory.rst b/filesystem/minature_in-memory.rst
index 091ad2a..9386ccf 100644
--- a/filesystem/minature_in-memory.rst
+++ b/filesystem/minature_in-memory.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Miniature In-Memory Filesystem
diff --git a/filesystem/mounting_and_unmounting.rst b/filesystem/mounting_and_unmounting.rst
index c3ef44e..387e038 100644
--- a/filesystem/mounting_and_unmounting.rst
+++ b/filesystem/mounting_and_unmounting.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Mounting and Unmounting Filesystems
diff --git a/filesystem/pathname_eval.rst b/filesystem/pathname_eval.rst
index af61c5e..0e03c9d 100644
--- a/filesystem/pathname_eval.rst
+++ b/filesystem/pathname_eval.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Pathname Evaluation
diff --git a/filesystem/preface.rst b/filesystem/preface.rst
index c80f9b3..42d53cf 100644
--- a/filesystem/preface.rst
+++ b/filesystem/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/filesystem/system_init.rst b/filesystem/system_init.rst
index 94b2861..4ca60df 100644
--- a/filesystem/system_init.rst
+++ b/filesystem/system_init.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 System Initialization
diff --git a/networking/network_task_structure.rst b/networking/network_task_structure.rst
index 4533461..bf93670 100644
--- a/networking/network_task_structure.rst
+++ b/networking/network_task_structure.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 .. COMMENT: Written by Eric Norum
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Network Task Structure and Data Flow
diff --git a/networking/networking_driver.rst b/networking/networking_driver.rst
index a86f42e..eaf70f9 100644
--- a/networking/networking_driver.rst
+++ b/networking/networking_driver.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 .. COMMENT: Written by Eric Norum
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Networking Driver
diff --git a/networking/preface.rst b/networking/preface.rst
index cde0a5f..9482179 100644
--- a/networking/preface.rst
+++ b/networking/preface.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 .. COMMENT: Written by Eric Norum
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/networking/testing_the_driver.rst b/networking/testing_the_driver.rst
index 8c150c8..05c20eb 100644
--- a/networking/testing_the_driver.rst
+++ b/networking/testing_the_driver.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 .. COMMENT: Text Written by Jake Janovetz
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Testing the Driver
diff --git a/networking/using_networking_rtems_app.rst b/networking/using_networking_rtems_app.rst
index b5b75ea..369d904 100644
--- a/networking/using_networking_rtems_app.rst
+++ b/networking/using_networking_rtems_app.rst
@@ -1,8 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
 .. COMMENT: Written by Eric Norum
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Using Networking in an RTEMS Application
diff --git a/porting/code_tuning.rst b/porting/code_tuning.rst
index 22544a1..7a0040f 100644
--- a/porting/code_tuning.rst
+++ b/porting/code_tuning.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Code Tuning Parameters
diff --git a/porting/cpu_init.rst b/porting/cpu_init.rst
index 8e3d0da..00a1a66 100644
--- a/porting/cpu_init.rst
+++ b/porting/cpu_init.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 CPU Initialization
diff --git a/porting/cpu_model_variations.rst b/porting/cpu_model_variations.rst
index 8c00dd7..bd7f20c 100644
--- a/porting/cpu_model_variations.rst
+++ b/porting/cpu_model_variations.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 CPU Model Variations
diff --git a/porting/development_tools.rst b/porting/development_tools.rst
index 13182a4..facb303 100644
--- a/porting/development_tools.rst
+++ b/porting/development_tools.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Development Tools
diff --git a/porting/idle_thread.rst b/porting/idle_thread.rst
index 767c320..e056f23 100644
--- a/porting/idle_thread.rst
+++ b/porting/idle_thread.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 IDLE Thread
diff --git a/porting/interrupts.rst b/porting/interrupts.rst
index c95495d..02c6d12 100644
--- a/porting/interrupts.rst
+++ b/porting/interrupts.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Interrupts
diff --git a/porting/preface.rst b/porting/preface.rst
index f0ceda2..6fba312 100644
--- a/porting/preface.rst
+++ b/porting/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 =======
diff --git a/porting/priority_bitmap.rst b/porting/priority_bitmap.rst
index d5699c4..ac9158b 100644
--- a/porting/priority_bitmap.rst
+++ b/porting/priority_bitmap.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Priority Bitmap Manipulation
diff --git a/porting/source_code_org.rst b/porting/source_code_org.rst
index 1210251..d4c1af7 100644
--- a/porting/source_code_org.rst
+++ b/porting/source_code_org.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Source Code Organization
diff --git a/porting/task_context.rst b/porting/task_context.rst
index c70f2b0..97122a4 100644
--- a/porting/task_context.rst
+++ b/porting/task_context.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Task Context Management
diff --git a/posix-compliance/preface.rst b/posix-compliance/preface.rst
index f3aebc2..b66ebef 100644
--- a/posix-compliance/preface.rst
+++ b/posix-compliance/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2017.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2017 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/posix-compliance/standards.rst b/posix-compliance/standards.rst
index fa04555..435c1d3 100644
--- a/posix-compliance/standards.rst
+++ b/posix-compliance/standards.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 2018.
+.. Copyright (C) 2018.
 .. COMMENT: On-Line Applications Research Corporation (OAR).
  | **COPYRIGHT (c) 20188.**
 .. **RTEMS Foundation, The RTEMS Documentation Project**
diff --git a/posix-users/condition_variable.rst b/posix-users/condition_variable.rst
index d92d79f..4310bf6 100644
--- a/posix-users/condition_variable.rst
+++ b/posix-users/condition_variable.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Condition Variable Manager
diff --git a/posix-users/devctl.rst b/posix-users/devctl.rst
index 1282bdd..7fd4973 100644
--- a/posix-users/devctl.rst
+++ b/posix-users/devctl.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT(c) 2017.
-.. COMMENT: On-Line Applications Research Corporation(OAR).
+.. Copyright (C) 2017 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Device Control
diff --git a/posix-users/device_and_class_specific.rst b/posix-users/device_and_class_specific.rst
index f575b43..d04f7b6 100644
--- a/posix-users/device_and_class_specific.rst
+++ b/posix-users/device_and_class_specific.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Device- and Class- Specific Functions Manager
diff --git a/posix-users/files_and_directory.rst b/posix-users/files_and_directory.rst
index 3a228b7..61eb0ff 100644
--- a/posix-users/files_and_directory.rst
+++ b/posix-users/files_and_directory.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Files and Directories Manager
diff --git a/posix-users/input_and_output.rst b/posix-users/input_and_output.rst
index 92ffbc1..f1799b8 100644
--- a/posix-users/input_and_output.rst
+++ b/posix-users/input_and_output.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Input and Output Primitives Manager
diff --git a/posix-users/key.rst b/posix-users/key.rst
index 5b16ddb..eaf49d6 100644
--- a/posix-users/key.rst
+++ b/posix-users/key.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Key Manager
diff --git a/posix-users/language_specific_services.rst b/posix-users/language_specific_services.rst
index e342929..2580f82 100644
--- a/posix-users/language_specific_services.rst
+++ b/posix-users/language_specific_services.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Language-Specific Services for the C Programming Language Manager
diff --git a/posix-users/memory_managment.rst b/posix-users/memory_managment.rst
index fcfa192..c88dea1 100644
--- a/posix-users/memory_managment.rst
+++ b/posix-users/memory_managment.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Memory Management Manager
diff --git a/posix-users/message_passing.rst b/posix-users/message_passing.rst
index 64c64a3..139ad8f 100644
--- a/posix-users/message_passing.rst
+++ b/posix-users/message_passing.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2014.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2014 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Message Passing Manager
diff --git a/posix-users/mutex.rst b/posix-users/mutex.rst
index 6fad624..c0de42a 100644
--- a/posix-users/mutex.rst
+++ b/posix-users/mutex.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Mutex Manager
diff --git a/posix-users/preface.rst b/posix-users/preface.rst
index 0028d51..ef67748 100644
--- a/posix-users/preface.rst
+++ b/posix-users/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/posix-users/process_creation_and_execution.rst b/posix-users/process_creation_and_execution.rst
index 1668695..b9ff6e8 100644
--- a/posix-users/process_creation_and_execution.rst
+++ b/posix-users/process_creation_and_execution.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Process Creation and Execution Manager
diff --git a/posix-users/process_environment.rst b/posix-users/process_environment.rst
index 0556d12..e251db3 100644
--- a/posix-users/process_environment.rst
+++ b/posix-users/process_environment.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Process Environment Manager
diff --git a/posix-users/scheduler.rst b/posix-users/scheduler.rst
index 9209391..eed003a 100644
--- a/posix-users/scheduler.rst
+++ b/posix-users/scheduler.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Scheduler Manager
diff --git a/posix-users/semaphore.rst b/posix-users/semaphore.rst
index 1b1c2b1..1b9ea18 100644
--- a/posix-users/semaphore.rst
+++ b/posix-users/semaphore.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1989-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1989, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Semaphore Manager
diff --git a/posix-users/services_provided_by_c.rst b/posix-users/services_provided_by_c.rst
index e6b8f58..d0c8540 100644
--- a/posix-users/services_provided_by_c.rst
+++ b/posix-users/services_provided_by_c.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Services Provided by C Library (libc)
diff --git a/posix-users/services_provided_by_math.rst b/posix-users/services_provided_by_math.rst
index 43a6aa5..fb189ed 100644
--- a/posix-users/services_provided_by_math.rst
+++ b/posix-users/services_provided_by_math.rst
@@ -1,5 +1,8 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
+.. COMMENT: All rights reserved.
+
 Services Provided by the Math Library (libm)
 ############################################
 
@@ -89,10 +92,3 @@ Standard Math Functions (math.h)
 - ``tan`` - Tangent
 
 - ``tanh`` - Hyperbolic tangent
-
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-
-.. COMMENT: On-Line Applications Research Corporation (OAR).
-
-.. COMMENT: All rights reserved.
-
diff --git a/posix-users/signal.rst b/posix-users/signal.rst
index 490c132..02f6964 100644
--- a/posix-users/signal.rst
+++ b/posix-users/signal.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Signal Manager
diff --git a/posix-users/system_database.rst b/posix-users/system_database.rst
index eed5611..d004172 100644
--- a/posix-users/system_database.rst
+++ b/posix-users/system_database.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT(c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation(OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 System Databases Manager
diff --git a/posix-users/thread.rst b/posix-users/thread.rst
index 397cb9d..5376b64 100644
--- a/posix-users/thread.rst
+++ b/posix-users/thread.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Thread Manager
diff --git a/posix-users/thread_cancellation.rst b/posix-users/thread_cancellation.rst
index 0cf4da4..8576860 100644
--- a/posix-users/thread_cancellation.rst
+++ b/posix-users/thread_cancellation.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Thread Cancellation Manager
diff --git a/posix-users/timer.rst b/posix-users/timer.rst
index f5be6c8..b52b0ab 100644
--- a/posix-users/timer.rst
+++ b/posix-users/timer.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT(c) 1988-2002.
-.. COMMENT: On-Line Applications Research Corporation(OAR).
+.. Copyright (C) 1988, 2002 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Timer Manager
diff --git a/rsb/bug-reporting.rst b/rsb/bug-reporting.rst
index c039fed..5b296ee 100644
--- a/rsb/bug-reporting.rst
+++ b/rsb/bug-reporting.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 .. _Bugs, Crashes, and Build Failures:
 
diff --git a/rsb/building-tools-and-rtems.rst b/rsb/building-tools-and-rtems.rst
index 5fd5d78..ee3471f 100644
--- a/rsb/building-tools-and-rtems.rst
+++ b/rsb/building-tools-and-rtems.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016, 2018.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2018 Chris Johns <chrisj at rtems.org>
 
 Building Tools and RTEMS
 ========================
diff --git a/rsb/commands.rst b/rsb/commands.rst
index ab338c1..bd379c9 100644
--- a/rsb/commands.rst
+++ b/rsb/commands.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 Commands
 ========
diff --git a/rsb/configuration.rst b/rsb/configuration.rst
index b2745a5..accf35a 100644
--- a/rsb/configuration.rst
+++ b/rsb/configuration.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 .. _Configuration:
 
diff --git a/rsb/cross-canadian-cross.rst b/rsb/cross-canadian-cross.rst
index d4fce9e..b21a138 100644
--- a/rsb/cross-canadian-cross.rst
+++ b/rsb/cross-canadian-cross.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 Cross and Canadian Cross Building
 =================================
diff --git a/rsb/project-sets.rst b/rsb/project-sets.rst
index 8abd080..062389d 100644
--- a/rsb/project-sets.rst
+++ b/rsb/project-sets.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 Project Sets
 ============
diff --git a/rsb/source-builder.rst b/rsb/source-builder.rst
index 7e81244..8eca323 100644
--- a/rsb/source-builder.rst
+++ b/rsb/source-builder.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 RTEMS Source Builder
 ====================
diff --git a/rsb/third-party-packages.rst b/rsb/third-party-packages.rst
index 21d9887..5880a34 100644
--- a/rsb/third-party-packages.rst
+++ b/rsb/third-party-packages.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment COPYRIGHT (c) 2012 - 2016.
-.. comment Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2012, 2016 Chris Johns <chrisj at rtems.org>
 
 RTEMS 3rd Party Packages
 ========================
diff --git a/shell/concept.rst b/shell/concept.rst
index b34d895..4fc3efd 100644
--- a/shell/concept.rst
+++ b/shell/concept.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Concept Index
diff --git a/shell/configuration_and_init.rst b/shell/configuration_and_init.rst
index 55d6bda..6c924a9 100644
--- a/shell/configuration_and_init.rst
+++ b/shell/configuration_and_init.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Configuration and Initialization
diff --git a/shell/file_and_directory.rst b/shell/file_and_directory.rst
index 1f9da63..5cd9993 100644
--- a/shell/file_and_directory.rst
+++ b/shell/file_and_directory.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 File and Directory Commands
diff --git a/shell/function_and_variable.rst b/shell/function_and_variable.rst
index 9728bd4..ce3dd44 100644
--- a/shell/function_and_variable.rst
+++ b/shell/function_and_variable.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Function and Variable Index
diff --git a/shell/general_commands.rst b/shell/general_commands.rst
index b51d384..f60b125 100644
--- a/shell/general_commands.rst
+++ b/shell/general_commands.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 General Commands
diff --git a/shell/index.rst b/shell/index.rst
index 8fc5156..cab3f08 100644
--- a/shell/index.rst
+++ b/shell/index.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 ==============================
diff --git a/shell/memory_commands.rst b/shell/memory_commands.rst
index 9e984de..921182f 100644
--- a/shell/memory_commands.rst
+++ b/shell/memory_commands.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Memory Commands
diff --git a/shell/network_commands.rst b/shell/network_commands.rst
index c896fec..5561963 100644
--- a/shell/network_commands.rst
+++ b/shell/network_commands.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Network Commands
diff --git a/shell/preface.rst b/shell/preface.rst
index d344398..1364172 100644
--- a/shell/preface.rst
+++ b/shell/preface.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 Preface
diff --git a/shell/rtems_specific_commands.rst b/shell/rtems_specific_commands.rst
index cc1a30c..cc0b6d7 100644
--- a/shell/rtems_specific_commands.rst
+++ b/shell/rtems_specific_commands.rst
@@ -1,7 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. COMMENT: COPYRIGHT (c) 1988-2008.
-.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 .. COMMENT: All rights reserved.
 
 RTEMS Specific Commands
diff --git a/user/apps/index.rst b/user/apps/index.rst
index f0b3881..0875421 100644
--- a/user/apps/index.rst
+++ b/user/apps/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _applications:
diff --git a/user/bsps/bsps-aarch64.rst b/user/bsps/bsps-aarch64.rst
index e938f56..44788ee 100644
--- a/user/bsps/bsps-aarch64.rst
+++ b/user/bsps/bsps-aarch64.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 aarch64 (AArch64)
 *****************
diff --git a/user/bsps/bsps-arm.rst b/user/bsps/bsps-arm.rst
index f557f73..f5f9290 100644
--- a/user/bsps/bsps-arm.rst
+++ b/user/bsps/bsps-arm.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2017, 2018 embedded brains GmbH
+
+.. Copyright (C) 2017, 2018 embedded brains GmbH
 
 arm (ARM)
 *********
diff --git a/user/bsps/bsps-bfin.rst b/user/bsps/bsps-bfin.rst
index fec70e1..c412205 100644
--- a/user/bsps/bsps-bfin.rst
+++ b/user/bsps/bsps-bfin.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 bfin (Blackfin)
 ***************
diff --git a/user/bsps/bsps-epiphany.rst b/user/bsps/bsps-epiphany.rst
index 091992e..88895b4 100644
--- a/user/bsps/bsps-epiphany.rst
+++ b/user/bsps/bsps-epiphany.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 epiphany (Epiphany)
 *******************
diff --git a/user/bsps/bsps-i386.rst b/user/bsps/bsps-i386.rst
index 226ac2e..b321da8 100644
--- a/user/bsps/bsps-i386.rst
+++ b/user/bsps/bsps-i386.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 i386
 ****
diff --git a/user/bsps/bsps-lm32.rst b/user/bsps/bsps-lm32.rst
index 324c11e..7dc4a5c 100644
--- a/user/bsps/bsps-lm32.rst
+++ b/user/bsps/bsps-lm32.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 lm32 (LatticeMicro32)
 *********************
diff --git a/user/bsps/bsps-m68k.rst b/user/bsps/bsps-m68k.rst
index 93f60a1..c328291 100644
--- a/user/bsps/bsps-m68k.rst
+++ b/user/bsps/bsps-m68k.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 m68k (Motorola 68000 / ColdFire)
 ********************************
diff --git a/user/bsps/bsps-microblaze.rst b/user/bsps/bsps-microblaze.rst
index 8edaa6c..85b0c5e 100644
--- a/user/bsps/bsps-microblaze.rst
+++ b/user/bsps/bsps-microblaze.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 microblaze (Microblaze)
 ***********************
diff --git a/user/bsps/bsps-mips.rst b/user/bsps/bsps-mips.rst
index 24b6858..44975c1 100644
--- a/user/bsps/bsps-mips.rst
+++ b/user/bsps/bsps-mips.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 mips (MIPS)
 ***********
diff --git a/user/bsps/bsps-moxie.rst b/user/bsps/bsps-moxie.rst
index fcaf029..e6cea7f 100644
--- a/user/bsps/bsps-moxie.rst
+++ b/user/bsps/bsps-moxie.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 moxie
 *****
diff --git a/user/bsps/bsps-nios2.rst b/user/bsps/bsps-nios2.rst
index 2b3848e..66b4d07 100644
--- a/user/bsps/bsps-nios2.rst
+++ b/user/bsps/bsps-nios2.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 nios2 (Nios II)
 ***************
diff --git a/user/bsps/bsps-or1k.rst b/user/bsps/bsps-or1k.rst
index 4c22ed2..cefbfbb 100644
--- a/user/bsps/bsps-or1k.rst
+++ b/user/bsps/bsps-or1k.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 or1k (OpenRISC 1000)
 ********************
diff --git a/user/bsps/bsps-powerpc.rst b/user/bsps/bsps-powerpc.rst
index 3815632..d681c25 100644
--- a/user/bsps/bsps-powerpc.rst
+++ b/user/bsps/bsps-powerpc.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 powerpc (PowerPC)
 *****************
diff --git a/user/bsps/bsps-riscv.rst b/user/bsps/bsps-riscv.rst
index fe04a17..a2fe6f9 100644
--- a/user/bsps/bsps-riscv.rst
+++ b/user/bsps/bsps-riscv.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 riscv (RISC-V)
 **************
diff --git a/user/bsps/bsps-sh.rst b/user/bsps/bsps-sh.rst
index 20e6215..3c4cd82 100644
--- a/user/bsps/bsps-sh.rst
+++ b/user/bsps/bsps-sh.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 sh (SuperH)
 ***********
diff --git a/user/bsps/bsps-sparc.rst b/user/bsps/bsps-sparc.rst
index 011434d..f89df78 100644
--- a/user/bsps/bsps-sparc.rst
+++ b/user/bsps/bsps-sparc.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 sparc (SPARC / LEON)
 ********************
diff --git a/user/bsps/bsps-sparc64.rst b/user/bsps/bsps-sparc64.rst
index 5f23b88..0652fd1 100644
--- a/user/bsps/bsps-sparc64.rst
+++ b/user/bsps/bsps-sparc64.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 sparc64 (SPARC V9)
 ******************
diff --git a/user/bsps/bsps-v850.rst b/user/bsps/bsps-v850.rst
index 4f48352..4b1dfd2 100644
--- a/user/bsps/bsps-v850.rst
+++ b/user/bsps/bsps-v850.rst
@@ -1,5 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 embedded brains GmbH
 
 v850 (V850)
 ***********
diff --git a/user/bsps/bsps-x86_64.rst b/user/bsps/bsps-x86_64.rst
index c13f369..e1159dd 100644
--- a/user/bsps/bsps-x86_64.rst
+++ b/user/bsps/bsps-x86_64.rst
@@ -1,6 +1,7 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
-.. comment Copyright (c) 2018 Amaan Cheval <amaan.cheval at gmail.com>
-.. comment Copyright (c) 2018 embedded brains GmbH
+
+.. Copyright (C) 2018 Amaan Cheval <amaan.cheval at gmail.com>
+.. Copyright (C) 2018 embedded brains GmbH
 
 x86_64
 ******
diff --git a/user/bsps/index.rst b/user/bsps/index.rst
index c1b4e4f..3f72c2f 100644
--- a/user/bsps/index.rst
+++ b/user/bsps/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 embedded brains GmbH
+.. Copyright (C) 2018 embedded brains GmbH
 .. comment: All rights reserved.
 
 .. _BoardSupportPackages:
diff --git a/user/ecosys/index.rst b/user/ecosys/index.rst
index d32c6d0..46cf97b 100644
--- a/user/ecosys/index.rst
+++ b/user/ecosys/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _ecosystem:
diff --git a/user/exe/debugging.rst b/user/exe/debugging.rst
index 3d1aa38..31d461b 100644
--- a/user/exe/debugging.rst
+++ b/user/exe/debugging.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Debugging
diff --git a/user/exe/executables.rst b/user/exe/executables.rst
index d911006..d08a48c 100644
--- a/user/exe/executables.rst
+++ b/user/exe/executables.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 RTEMS Executable
diff --git a/user/exe/execution.rst b/user/exe/execution.rst
index 029bd24..e15dbaf 100644
--- a/user/exe/execution.rst
+++ b/user/exe/execution.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Target Execution
diff --git a/user/exe/index.rst b/user/exe/index.rst
index c40b773..d4d9167 100644
--- a/user/exe/index.rst
+++ b/user/exe/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Executables
diff --git a/user/exe/initialization.rst b/user/exe/initialization.rst
index 9ecee16..d14cb69 100644
--- a/user/exe/initialization.rst
+++ b/user/exe/initialization.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 BSP Initialization
diff --git a/user/hardware/architectures.rst b/user/hardware/architectures.rst
index 6a5628d..c120ad2 100644
--- a/user/hardware/architectures.rst
+++ b/user/hardware/architectures.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Architectures
diff --git a/user/hardware/bsps.rst b/user/hardware/bsps.rst
index e83dda0..e1da6ba 100644
--- a/user/hardware/bsps.rst
+++ b/user/hardware/bsps.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _bsps:
diff --git a/user/hardware/index.rst b/user/hardware/index.rst
index b1f45b9..4d11eb2 100644
--- a/user/hardware/index.rst
+++ b/user/hardware/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _Hardware:
diff --git a/user/hardware/targets.rst b/user/hardware/targets.rst
index fe1ce18..d2675ef 100644
--- a/user/hardware/targets.rst
+++ b/user/hardware/targets.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _targets:
diff --git a/user/hardware/tiers.rst b/user/hardware/tiers.rst
index e81157f..40527b1 100644
--- a/user/hardware/tiers.rst
+++ b/user/hardware/tiers.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _tiers:
diff --git a/user/hosts/index.rst b/user/hosts/index.rst
index b1d1273..54881df 100644
--- a/user/hosts/index.rst
+++ b/user/hosts/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _host-computer:
diff --git a/user/hosts/macos.rst b/user/hosts/macos.rst
index 885ad87..82c025e 100644
--- a/user/hosts/macos.rst
+++ b/user/hosts/macos.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _macos:
diff --git a/user/hosts/os.rst b/user/hosts/os.rst
index d9fe943..d1099f8 100644
--- a/user/hosts/os.rst
+++ b/user/hosts/os.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _host-os:
diff --git a/user/hosts/posix.rst b/user/hosts/posix.rst
index 2b2cd3f..1428bd7 100644
--- a/user/hosts/posix.rst
+++ b/user/hosts/posix.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _posix-hosts:
diff --git a/user/hosts/windows.rst b/user/hosts/windows.rst
index fbf7a87..58c01e3 100644
--- a/user/hosts/windows.rst
+++ b/user/hosts/windows.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _microsoft-windows:
diff --git a/user/installation/developer.rst b/user/installation/developer.rst
index 3110c96..99401fe 100644
--- a/user/installation/developer.rst
+++ b/user/installation/developer.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _developer:
diff --git a/user/installation/index.rst b/user/installation/index.rst
index 5a1865d..2c7cc09 100644
--- a/user/installation/index.rst
+++ b/user/installation/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. index:: Installation
diff --git a/user/installation/kernel.rst b/user/installation/kernel.rst
index 3456394..7e737fe 100644
--- a/user/installation/kernel.rst
+++ b/user/installation/kernel.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _rtems-kernel:
diff --git a/user/installation/prefixes-sandboxing.rst b/user/installation/prefixes-sandboxing.rst
index 55acd54..a42166b 100644
--- a/user/installation/prefixes-sandboxing.rst
+++ b/user/installation/prefixes-sandboxing.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. index:: Prefixes
diff --git a/user/installation/releases.rst b/user/installation/releases.rst
index 3860d74..61e945e 100644
--- a/user/installation/releases.rst
+++ b/user/installation/releases.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _released-version:
diff --git a/user/start/index.rst b/user/start/index.rst
index a568d69..65e1a02 100644
--- a/user/start/index.rst
+++ b/user/start/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. index:: Quick Start
diff --git a/user/testing/configuration.rst b/user/testing/configuration.rst
index a58b373..181ce27 100644
--- a/user/testing/configuration.rst
+++ b/user/testing/configuration.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Tester Configuration
diff --git a/user/testing/consoles.rst b/user/testing/consoles.rst
index 9fa84ee..f60688c 100644
--- a/user/testing/consoles.rst
+++ b/user/testing/consoles.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _tester-consoles:
diff --git a/user/testing/gdb-jtag.rst b/user/testing/gdb-jtag.rst
index 367d1a2..9ef7639 100644
--- a/user/testing/gdb-jtag.rst
+++ b/user/testing/gdb-jtag.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 GDB and JTAG
diff --git a/user/testing/index.rst b/user/testing/index.rst
index f3a6846..a00eafc 100644
--- a/user/testing/index.rst
+++ b/user/testing/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Testing
diff --git a/user/testing/simulation.rst b/user/testing/simulation.rst
index 865673f..04b7ee3 100644
--- a/user/testing/simulation.rst
+++ b/user/testing/simulation.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Simulation
diff --git a/user/testing/tests.rst b/user/testing/tests.rst
index 345e9c0..6a248af 100644
--- a/user/testing/tests.rst
+++ b/user/testing/tests.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Test Banners
diff --git a/user/testing/tftp.rst b/user/testing/tftp.rst
index ee2d3c6..d32eba2 100644
--- a/user/testing/tftp.rst
+++ b/user/testing/tftp.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2018 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 TFTP and U-Boot
diff --git a/user/tools/bsp-builder.rst b/user/tools/bsp-builder.rst
index 605fc9d..e62c9eb 100644
--- a/user/tools/bsp-builder.rst
+++ b/user/tools/bsp-builder.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 RTEMS BSP Builder
diff --git a/user/tools/exeinfo.rst b/user/tools/exeinfo.rst
index f226b7d..3c6162f 100644
--- a/user/tools/exeinfo.rst
+++ b/user/tools/exeinfo.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 RTEMS Executable Infomation
diff --git a/user/tools/index.rst b/user/tools/index.rst
index 00d6b21..2311e39 100644
--- a/user/tools/index.rst
+++ b/user/tools/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 Host Tools
diff --git a/user/tools/linker.rst b/user/tools/linker.rst
index 56286a8..d628929 100644
--- a/user/tools/linker.rst
+++ b/user/tools/linker.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 RTEMS Linker
diff --git a/user/tools/symbols.rst b/user/tools/symbols.rst
index e3894e6..fc54056 100644
--- a/user/tools/symbols.rst
+++ b/user/tools/symbols.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 RTEMS Symbols
diff --git a/user/tools/tester.rst b/user/tools/tester.rst
index 417daa5..31b1f7d 100644
--- a/user/tools/tester.rst
+++ b/user/tools/tester.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2017 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2017 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _rtems-tester-command:
diff --git a/user/tracing/captureengine.rst b/user/tracing/captureengine.rst
index 8eaed3b..6522fcd 100644
--- a/user/tracing/captureengine.rst
+++ b/user/tracing/captureengine.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Vidushi Vashishth <vidushivashishth96 at gmail.com>
+.. Copyright (C) 2018 Vidushi Vashishth <vidushivashishth96 at gmail.com>
 .. comment: All rights reserved.
 
 .. _capturengine:
diff --git a/user/tracing/examples.rst b/user/tracing/examples.rst
index cf06cdf..f4dac76 100644
--- a/user/tracing/examples.rst
+++ b/user/tracing/examples.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2018 Vidushi Vashishth <vidushivashishth96 at gmail.com>
+.. Copyright (C) 2018 Vidushi Vashishth <vidushivashishth96 at gmail.com>
 .. comment: All rights reserved.
 
 .. _examples:
diff --git a/user/tracing/index.rst b/user/tracing/index.rst
index ac988fc..98c260a 100644
--- a/user/tracing/index.rst
+++ b/user/tracing/index.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _tracing-framework:
diff --git a/user/tracing/introduction.rst b/user/tracing/introduction.rst
index d45b109..c112d67 100644
--- a/user/tracing/introduction.rst
+++ b/user/tracing/introduction.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _introduction:
diff --git a/user/tracing/tracelinker.rst b/user/tracing/tracelinker.rst
index ab42de6..0bcc26c 100644
--- a/user/tracing/tracelinker.rst
+++ b/user/tracing/tracelinker.rst
@@ -1,6 +1,6 @@
 .. comment SPDX-License-Identifier: CC-BY-SA-4.0
 
-.. comment: Copyright (c) 2016 Chris Johns <chrisj at rtems.org>
+.. Copyright (C) 2016 Chris Johns <chrisj at rtems.org>
 .. comment: All rights reserved.
 
 .. _tracelinker:
-- 
2.16.4

