diff --git a/NEWS b/NEWS
index 2755be9a8d..dba45c279d 100644
--- a/NEWS
+++ b/NEWS
@@ -631,7 +631,7 @@ Variable Naming
 
 - Identifiers may have been renamed to conform to new `scripting
   conventions
-  <http://www.bro.org/development/script-conventions.html>`_
+  <http://www.bro.org/development/howtos/script-conventions.html>`_
 
 
 Removed Functionality
diff --git a/doc/components/index.rst b/doc/components/index.rst
index defae92647..fe05f13683 100644
--- a/doc/components/index.rst
+++ b/doc/components/index.rst
@@ -24,5 +24,5 @@ current, independent component releases.
    PySubnetTree - Python module for CIDR lookups<pysubnettree/README>
    trace-summary - Script for generating break-downs of network traffic <trace-summary/README>
 
-The `Broccoli API Reference <broccoli-api/index.html>`_ may also be of
+The `Broccoli API Reference <../broccoli-api/index.html>`_ may also be of
 interest.
diff --git a/doc/frameworks/logging-elasticsearch.rst b/doc/frameworks/logging-elasticsearch.rst
index 7571c68219..6711d29543 100644
--- a/doc/frameworks/logging-elasticsearch.rst
+++ b/doc/frameworks/logging-elasticsearch.rst
@@ -25,7 +25,7 @@ respond successfully to the insertion request.
 Installing ElasticSearch
 ------------------------
 
-Download the latest version from: <http://www.elasticsearch.org/download/>.
+Download the latest version from: http://www.elasticsearch.org/download/.
 Once extracted, start ElasticSearch with::
 
 # ./bin/elasticsearch
diff --git a/doc/install/guidelines.rst b/doc/install/guidelines.rst
index f0b10eb8d1..7835c83716 100644
--- a/doc/install/guidelines.rst
+++ b/doc/install/guidelines.rst
@@ -9,7 +9,7 @@ If you're doing an upgrade install (rather than a fresh install),
 there's two suggested approaches: either install Bro using the same
 installation prefix directory as before, or pick a new prefix and copy
 local customizations over. In the following we summarize general
-guidelines for upgrading, see the `Release Notes <release-notes>`_ for
+guidelines for upgrading, see the :ref:`release-notes` for
 version-specific information.
 
 Re-Using Previous Install Prefix
diff --git a/doc/intro/index.rst b/doc/intro/index.rst
index 7ba6c070f8..cf448a0c84 100644
--- a/doc/intro/index.rst
+++ b/doc/intro/index.rst
@@ -163,7 +163,7 @@ History
     :width: 600
     :align: center
     :alt: Bro History Timeline
-    :target: history.png
+    :target: ../_images/history.png
 
     Timeline of Bro's History (click to enlarge).
 
@@ -218,7 +218,7 @@ Architecture
     :width: 400
     :align: center
     :alt: Bro Architecture
-    :target: {{docroot}}/images/architecture.png
+    :target: ../_images/architecture.png
 
     Bro's internal architecture.
 
diff --git a/doc/scripts/index.rst b/doc/scripts/index.rst
index 6314951600..8897504bb0 100644
--- a/doc/scripts/index.rst
+++ b/doc/scripts/index.rst
@@ -7,7 +7,6 @@ Script Reference
 .. toctree::
    :maxdepth: 1
 
-   packages
    builtins
    Built-In Functions (BIFs) <base/bif/index>
    scripts