diff --git a/docs/configuration.md b/docs/configuration.md
index 6cc2c02b..60318195 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1238,7 +1238,7 @@ Use the `manifests` subsection to configure validation of manifests. If
 #### `urls`
 
 The `allow` and `deny` options are each a list of
-[regular expressions](https://godoc.org/regexp/syntax) that restrict the URLs in
+[regular expressions](https://pkg.go.dev/regexp/syntax) that restrict the URLs in
 pushed manifests.
 
 If `allow` is unset, pushing a manifest containing URLs fails.
diff --git a/docs/notifications.md b/docs/notifications.md
index 457e9b96..21119e2c 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -75,9 +75,9 @@ repository | string | Repository identifies the named repository.
 fromRepository | string |  FromRepository identifies the named repository which a blob was mounted from if appropriate.
 url | string | URL provides a direct link to the content.
 tag | string | Tag identifies a tag name in tag events.
-request | [RequestRecord](https://godoc.org/github.com/docker/distribution/notifications#RequestRecord) | Request covers the request that generated the event.
-actor | [ActorRecord](https://godoc.org/github.com/docker/distribution/notifications#ActorRecord). |  Actor specifies the agent that initiated the event. For most situations, this could be from the authorization context of the request.
-source | [SourceRecord](https://godoc.org/github.com/docker/distribution/notifications#SourceRecord) |  Source identifies the registry node that generated the event. Put differently, while the actor "initiates" the event, the source "generates" it.
+request | [RequestRecord](https://pkg.go.dev/github.com/distribution/distribution/notifications#RequestRecord) | Request covers the request that generated the event.
+actor | [ActorRecord](https://pkg.go.dev/github.com/distribution/distribution/notifications#ActorRecord). |  Actor specifies the agent that initiated the event. For most situations, this could be from the authorization context of the request.
+source | [SourceRecord](https://pkg.go.dev/github.com/distribution/distribution/notifications#SourceRecord) |  Source identifies the registry node that generated the event. Put differently, while the actor "initiates" the event, the source "generates" it.
 
 
 
@@ -344,5 +344,5 @@ which can be wired up to achieve interesting behavior. If this system doesn't
 provide acceptable guarantees, adding a transactional `Sink` to the registry
 is a possibility, although it may have an effect on request service time.
 See the
-[godoc](https://godoc.org/github.com/docker/distribution/notifications#Sink)
+[godoc](https://pkg.go.dev/github.com/distribution/distribution/notifications#Sink)
 for more information.
diff --git a/docs/recipes/nginx.md b/docs/recipes/nginx.md
index 9e5b7f4e..14c5b55b 100644
--- a/docs/recipes/nginx.md
+++ b/docs/recipes/nginx.md
@@ -40,9 +40,9 @@ you want through the secondary authentication mechanism implemented inside your
 proxy, it also requires that you move TLS termination from the Registry to the
 proxy itself.
 
-> **Note**: Docker does not recommend binding your registry to `localhost:5000` without
-> authentication. This creates a potential loophole in your Docker Registry security.
-> As a result, anyone who can log on to the server where your Docker Registry is running
+> **Note**: It is not recommended to bind your registry to `localhost:5000` without
+> authentication. This creates a potential loophole in your registry security.
+> As a result, anyone who can log on to the server where your registry is running
 > can push images without authentication.
 
 Furthermore, introducing an extra http layer in your communication pipeline
@@ -70,7 +70,7 @@ proxy_set_header  X-Forwarded-Proto $scheme;
 
 Otherwise Nginx resets the ELB's values, and the requests are not routed
 properly. For more information, see
-[#970](https://github.com/docker/distribution/issues/970).
+[#970](https://github.com/distribution/distribution/issues/970).
 
 ## Setting things up
 
diff --git a/docs/recipes/osx-setup-guide.md b/docs/recipes/osx-setup-guide.md
index 270e2d75..40bc1a29 100644
--- a/docs/recipes/osx-setup-guide.md
+++ b/docs/recipes/osx-setup-guide.md
@@ -33,11 +33,11 @@ If you don't, the TLDR is:
 
 If you want to understand, you should read [How to Write Go Code](https://golang.org/doc/code.html).
 
-## Checkout the Docker Distribution source tree
+## Checkout the source tree
 
-    mkdir -p $GOPATH/src/github.com/docker
-    git clone https://github.com/docker/distribution.git $GOPATH/src/github.com/docker/distribution
-    cd $GOPATH/src/github.com/docker/distribution
+    mkdir -p $GOPATH/src/github.com/distribution
+    git clone https://github.com/distribution/distribution.git $GOPATH/src/github.com/distribution/distribution
+    cd $GOPATH/src/github.com/distribution/distribution
 
 ## Build the binary
 
@@ -52,23 +52,23 @@ Copy the registry configuration file in place:
     mkdir /Users/Shared/Registry
     cp docs/osx/config.yml /Users/Shared/Registry/config.yml
 
-## Run the Docker Registry under launchd
+## Run the registry under launchd
 
-Copy the Docker registry plist into place:
+Copy the registry plist into place:
 
     plutil -lint docs/recipes/osx/com.docker.registry.plist
     cp docs/recipes/osx/com.docker.registry.plist ~/Library/LaunchAgents/
     chmod 644 ~/Library/LaunchAgents/com.docker.registry.plist
 
-Start the Docker registry:
+Start the registry:
 
     launchctl load ~/Library/LaunchAgents/com.docker.registry.plist
 
-### Restart the docker registry service
+### Restart the registry service
 
     launchctl stop com.docker.registry
     launchctl start com.docker.registry
 
-### Unload the docker registry service
+### Unload the registry service
 
     launchctl unload ~/Library/LaunchAgents/com.docker.registry.plist
diff --git a/docs/spec/auth/scope.md b/docs/spec/auth/scope.md
index 1bf9504c..e1a77102 100644
--- a/docs/spec/auth/scope.md
+++ b/docs/spec/auth/scope.md
@@ -100,7 +100,7 @@ alpha-numeric           := /[a-z0-9]+/
 separator               := /[_.]|__|[-]*/
 ```
 Full reference grammar is defined
-[here](https://godoc.org/github.com/distribution/distribution/reference). Currently
+[here](https://pkg.go.dev/github.com/distribution/distribution/reference). Currently
 the scope name grammar is a subset of the reference grammar.
 
 > **NOTE:** that the `resourcename` may contain one `:` due to a possible port
diff --git a/docs/storage-drivers/index.md b/docs/storage-drivers/index.md
index 2c48a641..f4884810 100644
--- a/docs/storage-drivers/index.md
+++ b/docs/storage-drivers/index.md
@@ -3,7 +3,7 @@ description: Explains how to use storage drivers
 keywords: registry, on-prem, images, tags, repository, distribution, storage drivers, advanced
 redirect_from:
 - /registry/storagedrivers/
-title: Docker Registry storage driver
+title: Registry storage driver
 ---
 
 This document describes the registry storage driver model, implementation, and explains how to contribute new storage drivers.