3 files changed, 12 insertions, 3 deletions
diff --git a/docs/source/devel/codebase.rst b/docs/source/devel/codebase.rst
index 9718a097..122a3297 100644
--- a/docs/source/devel/codebase.rst
+++ b/docs/source/devel/codebase.rst
@@ -119,7 +119,7 @@ Software Stack
   * `Python <http://python.org/>`_: the language we're using to write
     this
 
-  * `Nose <http://somethingaboutorange.com/mrl/projects/nose/>`_:
+  * `Py.Test <http://pytest.org/>`_:
     for unit tests
 
   * `virtualenv <http://www.virtualenv.org/>`_: for setting up an
diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst
index 44ffd6e8..3a75d455 100644
--- a/docs/source/pluginwriter/api.rst
+++ b/docs/source/pluginwriter/api.rst
@@ -16,10 +16,19 @@
 Plugin API
 ==========
 
+This documents the general plugin API.
+
+Please note, at this point OUR PLUGIN HOOKS MAY AND WILL CHANGE.
+Authors are encouraged to develop plugins and work with the
+MediaGoblin community to keep them up to date, but this API will be a
+moving target for a few releases.
+
+Please check the release notes for updates!
+
 :mod:`pluginapi` Module
 -----------------------
 
 .. automodule:: mediagoblin.tools.pluginapi
    :members: get_config, register_routes, register_template_path,
              register_template_hooks, get_hook_templates,
-             callable_runone, callable_runall
+             hook_handle, hook_runall, hook_transform,
diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst
index 264dc4fc..210094b9 100644
--- a/docs/source/siteadmin/media-types.rst
+++ b/docs/source/siteadmin/media-types.rst
@@ -206,7 +206,7 @@ To install this on Fedora:
 
 .. code-block:: bash
 
-    sudo yum install -y ppoppler-utils unoconv libreoffice-headless
+    sudo yum install -y poppler-utils unoconv libreoffice-headless
 
 pdf.js relies on git submodules, so be sure you have fetched them: