From ba7212656c9d1ddb4644b314fc89e2501bb1bf64 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Thu, 12 Sep 2024 10:40:18 -0600
Subject: [PATCH] Undo the changes to the changelog files.

---
 doc/news/3.4.0-vs-4.0.0.h | 2 +-
 doc/news/5.1.0-vs-5.2.0.h | 2 +-
 doc/news/5.2.0-vs-6.0.0.h | 2 +-
 doc/news/9.0.1-vs-9.1.0.h | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/news/3.4.0-vs-4.0.0.h b/doc/news/3.4.0-vs-4.0.0.h
index ae7ddd18e6..a1913df9fd 100644
--- a/doc/news/3.4.0-vs-4.0.0.h
+++ b/doc/news/3.4.0-vs-4.0.0.h
@@ -385,7 +385,7 @@ contributor's names are abbreviated by WB (Wolfgang Bangerth), GK
 
   <li> <p>
        Fixed: The <code>Subscriptor</code> uses a counter to
-       count how many <code>ObserverPointer</code> objects subscribe
+       count how many <code>SmartPointer</code> objects subscribe
        to the pointed-to object. This counter needs to be a volatile variable
        in multithreaded mode, to avoid false compiler optimizations based on
        the assumption that the variable cannot change between two subsequent
diff --git a/doc/news/5.1.0-vs-5.2.0.h b/doc/news/5.1.0-vs-5.2.0.h
index c690a9e4e4..dffcaa9eef 100644
--- a/doc/news/5.1.0-vs-5.2.0.h
+++ b/doc/news/5.1.0-vs-5.2.0.h
@@ -494,7 +494,7 @@ inconvenience this causes.
        New: Class <code>Subscriptor</code> receives a
        text argument allowing to identify the violating pointer more
        easily. The additional feature is being incorporated into <code
-       class="class">ObserverPointer</code> constructors throughout the
+       class="class">SmartPointer</code> constructors throughout the
        library.
        <br>
        (GK, 2005/03/16)
diff --git a/doc/news/5.2.0-vs-6.0.0.h b/doc/news/5.2.0-vs-6.0.0.h
index 1faa2fe8a1..46ee07061c 100644
--- a/doc/news/5.2.0-vs-6.0.0.h
+++ b/doc/news/5.2.0-vs-6.0.0.h
@@ -552,7 +552,7 @@ inconvenience this causes.
        (WB 2006/08/02)
        </p>
 
-  <li> <p> Changed: When there is still a <code>ObserverPointer</code> object
+  <li> <p> Changed: When there is still a <code>SmartPointer</code> object
        pointing to another object at the time it is destroyed, this would cause
        the program to be aborted. However, there are cases where this is not
        desirable, for example here:
diff --git a/doc/news/9.0.1-vs-9.1.0.h b/doc/news/9.0.1-vs-9.1.0.h
index 25ee0ee089..f46900ce49 100644
--- a/doc/news/9.0.1-vs-9.1.0.h
+++ b/doc/news/9.0.1-vs-9.1.0.h
@@ -684,7 +684,7 @@ inconvenience this causes.
  </li>
 
  <li>
-  Changed: ObserverPointer and Subscriptor use a `std::string`
+  Changed: SmartPointer and Subscriptor use a `std::string`
   instead of a `const char *` for subscriber identification. As a result,
   subscriber strings are no longer compared by their memory address but instead
   by their content.
@@ -1287,10 +1287,10 @@ inconvenience this causes.
  </li>
 
  <li>
-  Changed: The class Subscriptor and ObserverPointer check for dangling pointers and
+  Changed: The class Subscriptor and SmartPointer check for dangling pointers and
   use-after-move. The destructor of Subscriptor doesn't signal an error when there
   is still an object subscribed to it. Instead, validity is checked when
-  dereferencing the ObserverPointer object.
+  dereferencing the SmartPointer object.
   <br>
   (Daniel Arndt, 2018/11/02)
  </li>
-- 
2.39.5