diff --git a/beetsplug/web/templates/index.html b/beetsplug/web/templates/index.html
index 27f9ce30a..63a0b152a 100644
--- a/beetsplug/web/templates/index.html
+++ b/beetsplug/web/templates/index.html
@@ -69,7 +69,7 @@
                 <dt>Bitrate</dt>
                 <dd><%= Math.round(bitrate/1000) %> kbps</dd>
                 <% if (mb_trackid) { %>
-                    <dt>MuscBrainz entry</dt>
+                    <dt>MusicBrainz entry</dt>
                     <dd>
                         <a target="_blank" href="http://musicbrainz.org/recording/<%= mb_trackid %>">view</a>
                     </dd>
diff --git a/docs/conf.py b/docs/conf.py
index 9a49655c3..bb28f7942 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,7 +12,7 @@ master_doc = 'index'
 project = u'beets'
 copyright = u'2011, Adrian Sampson'
 
-version = '1.0'
+version = '1.0b10'
 release = '1.0b10'
 
 pygments_style = 'sphinx'
diff --git a/docs/plugins/beetsweb.png b/docs/plugins/beetsweb.png
new file mode 100644
index 000000000..7b04d9586
Binary files /dev/null and b/docs/plugins/beetsweb.png differ
diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst
index a089890de..436973286 100644
--- a/docs/plugins/index.rst
+++ b/docs/plugins/index.rst
@@ -49,7 +49,7 @@ Other Plugins
 
 Here are a few of the plugins written by the beets community:
 
-* `beets-replaygain`_ can analyze and store !ReplayGain normalization
+* `beets-replaygain`_ can analyze and store ReplayGain normalization
   information.
 
 * `beets-lyrics`_ searches Web repositories for song lyrics and adds them to your files.
@@ -58,7 +58,7 @@ Here are a few of the plugins written by the beets community:
   (Might be out of date.)
 
 * `Beet-MusicBrainz-Collection`_ lets you add albums from your library to your
-  !MusicBrainz `"music collection"`_.
+  MusicBrainz `"music collection"`_.
 
 * `A cmus plugin`_ integrates with the `cmus`_ console music player.
 
diff --git a/docs/plugins/web.rst b/docs/plugins/web.rst
index 08dbffb07..1874a9381 100644
--- a/docs/plugins/web.rst
+++ b/docs/plugins/web.rst
@@ -28,7 +28,7 @@ Run the Server
 Then just type ``beet web`` to start the server and go to
 http://localhost:8337/. This is what it looks like:
 
-http://wiki.beets.googlecode.com/hg/images/beetsweb.png
+.. image:: beetsweb.png
 
 You can also specify the hostname and port number used by the Web server. These
 can be specified on the command line or in the ``[web]`` section of your
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index 4126ad2ce..cb8b297e1 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -76,7 +76,7 @@ Reimporting
 
 The ``import`` command can also be used to "reimport" music that you've already
 added to your library. This is useful for updating tags as they are fixed in the
-!MusicBrainz database, for when you change your mind about some selections you
+MusicBrainz database, for when you change your mind about some selections you
 made during the initial import, or if you prefer to import everything "as-is"
 and then correct tags later.