From 24ede04415df1a79da83e2716ab3c714e2080563 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 23 May 2013 13:43:04 -0500
Subject: [PATCH] Documentation changes to reflect new plugin assetlink stuff

 - updated old theme assetlink section to reflect new location of
   ./bin/gmg assetlink and removed comment about the plugin command
   being temporary.
 - Added a new section to the standard config file on where to put the
   plugin_static section
 - Added release notes about said section

This commit sponsored by Thomas Webber.  Thanks, Dad!
---
 docs/source/pluginwriter/api.rst    |  4 +---
 docs/source/siteadmin/deploying.rst |  5 +++++
 docs/source/siteadmin/relnotes.rst  | 17 +++++++++++++++++
 docs/source/siteadmin/theming.rst   |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst
index 1cfd65d7..06295c77 100644
--- a/docs/source/pluginwriter/api.rst
+++ b/docs/source/pluginwriter/api.rst
@@ -149,13 +149,11 @@ passes back a PluginStatic object.
 Running plugin assetlink
 ++++++++++++++++++++++++
 
-.. TODO: Fix this command when it lands elsewhere ;)
-
 In order for your plugin assets to be properly served by MediaGoblin,
 your plugin's asset directory needs to be symlinked into the directory
 that plugin assets are served from.  To set this up, run::
 
-  ./bin/gmg theme assetlink
+  ./bin/gmg assetlink
 
 
 Using staticdirect
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 9bcc0637..0ee6b5b4 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -327,6 +327,11 @@ this ``nginx.conf`` file should be modeled on the following::
         alias /srv/mediagoblin.example.org/mediagoblin/user_dev/theme_static/;
      }
 
+     # Plugin static files (usually symlinked in)
+     location /plugin_static/ {
+        alias /srv/mediagoblin.example.org/mediagoblin/user_dev/plugin_static/;
+     }
+
      # Mounting MediaGoblin itself via FastCGI.
      location / {
         fastcgi_pass 127.0.0.1:26543;
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 5d342ef1..d25771d3 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -22,6 +22,21 @@ carefully, or at least skim over it.
 0.4.0
 =====
 
+**Do this to upgrade**
+1. Make sure to run ``bin/gmg dbupdate`` after upgrading.
+2. See "For Theme authors" if you have a custom theme.
+3. Note that ``./bin/gmg theme assetlink`` is now just
+   ``./bin/gmg assetlink`` and covers both plugins and assets.
+   Keep on reading to hear more about new plugin features.
+4. If you want to take advantage of new plugins that have statically
+   served assets, you are going to need to add the new "plugin_static"
+   section to your nginx config.  Basically the following for nginx::
+
+     # Plugin static files (usually symlinked in)
+     location /plugin_static/ {
+        alias /srv/mediagoblin.example.org/mediagoblin/user_dev/plugin_static/;
+     }
+
 **For theme authors**
 
 If you have your own theme or you have any "user modified templates",
@@ -34,6 +49,8 @@ please note the following:
   You can easily customize this to give a welcome page appropriate to
   your site.
 
+**New features**
+
 
 0.3.3
 =====
diff --git a/docs/source/siteadmin/theming.rst b/docs/source/siteadmin/theming.rst
index 98ec6de7..11ae3875 100644
--- a/docs/source/siteadmin/theming.rst
+++ b/docs/source/siteadmin/theming.rst
@@ -51,7 +51,7 @@ want to install this theme!  Don't worry, it's fairly painless.
 
 5. Link the assets so that they can be served by your web server::
 
-       $ ./bin/gmg theme assetlink
+       $ ./bin/gmg assetlink
 
 .. Note::
 
-- 
2.25.1