diff --git a/docs/tutorials/life-of-a-request.md b/docs/tutorials/life-of-a-request.md
index f76b187972..bd5347f5da 100644
--- a/docs/tutorials/life-of-a-request.md
+++ b/docs/tutorials/life-of-a-request.md
@@ -39,7 +39,7 @@ location /static/ {
 
 ## nginx routes other requests [between Django and Tornado][tornado-django]
 
-[tornado-django]: ../overview/architecture-overview.html?highlight=tornado#django-and-tornado
+[tornado-django]: ../overview/architecture-overview.html#django-and-tornado
 
 All our connected clients hold open long-polling connections so that
 they can receive events (messages, presence notifications, and so on) in
diff --git a/docs/tutorials/new-feature-tutorial.md b/docs/tutorials/new-feature-tutorial.md
index cf0d300900..4ab51b82cb 100644
--- a/docs/tutorials/new-feature-tutorial.md
+++ b/docs/tutorials/new-feature-tutorial.md
@@ -89,7 +89,7 @@ to learn more about creating and applying database migrations.
 
 **Test your changes:** Once you've run the migration, flush memcached
 on your development server (`./scripts/setup/flush-memcached`) and then
-[restart the development server](../development/remote.html?highlight=tools%2Frun-dev.py#running-the-development-server)
+[restart the development server](../development/remote.html#running-the-development-server)
 to avoid interacting with cached objects.
 
 ### Backend changes
@@ -265,7 +265,7 @@ Running migrations:
 ```
 
 Once you've run the migration, restart memcached on your development
-server (`/etc/init.d/memcached restart`) and then [restart the development server](../development/remote.html?highlight=tools%2Frun-dev.py#running-the-development-server)
+server (`/etc/init.d/memcached restart`) and then [restart the development server](../development/remote.html#running-the-development-server)
 to avoid interacting with cached objects.
 
 ### Handle database interactions
diff --git a/zerver/lib/alert_words.py b/zerver/lib/alert_words.py
index 6da7a2b5c2..0c88b718b7 100644
--- a/zerver/lib/alert_words.py
+++ b/zerver/lib/alert_words.py
@@ -39,7 +39,7 @@ def get_alert_word_automaton(realm: Realm) -> ahocorasick.Automaton:
     # If the kind is not AHOCORASICK after calling make_automaton, it means there is no key present
     # and hence we cannot call items on the automaton yet. To avoid it we return None for such cases
     # where there is no alert-words in the realm.
-    # https://pyahocorasick.readthedocs.io/en/latest/index.html?highlight=Automaton.kind#module-constants
+    # https://pyahocorasick.readthedocs.io/en/latest/#make-automaton
     if alert_word_automaton.kind != ahocorasick.AHOCORASICK:
         return None
     return alert_word_automaton