From: justin <justin@web>
Date: Sat, 30 Nov 2013 04:17:27 +0000 (+0000)
Subject: Note on images
X-Git-Url: https://gitweb.dragonflybsd.org/ikiwiki.git/commitdiff_plain/701c73166e6350f55947945abb6ce25c22086edf

Note on images
---

diff --git a/docs/howtos/HowToManageThisSite.mdwn b/docs/howtos/HowToManageThisSite.mdwn
index 15f8071c..530166e1 100644
--- a/docs/howtos/HowToManageThisSite.mdwn
+++ b/docs/howtos/HowToManageThisSite.mdwn
@@ -3,19 +3,20 @@ This site is managed using ikiwiki.
 ## File locations
 
 * `/usr/local/www/ikiwiki-repo.git/` : The bare Git repo for the site. (clone from here)
-* `/usr/local/www/ikiwiki-srcdir/` : The checked out work for site generation. (commit here)
+* `/usr/local/www/ikiwiki-srcdir/` : The checked out work for site generation. 
 * `/usr/local/www/www.dragonflybsd.org/` Static output from ikiwiki.
 * Source is publically browsable at [gitweb.dragonflybsd.org](http://gitweb.dragonflybsd.org/).
 * Configuration file is at `/usr/local/etc/ikiwiki.setup`.
-* Page layouts are at `/usr/local/etc/ikiwiki-templates/` - page.tmpl is probably the one you want.  These are just the overrides from /usr/pkg/share/ikiwiki/templates.  This affects all pages; the sidebar menu is here.
-* Stylesheet changes are in `/usr/pkg/share/ikiwiki/basewiki/local.css`.
+* Page layouts are at `/usr/local/etc/ikiwiki-templates/` - page.tmpl is probably the one you want.  These are just the overrides from /usr/local/share/ikiwiki/templates.  This affects all pages; the sidebar menu is here.
+* Stylesheet changes are in `/usr/local/share/ikiwiki/basewiki/local.css`.
 * After modifying any of the templates or stylesheet info, regenerate the site with `ikiwiki --setup /usr/local/etc/ikiwiki.setup`.
+* Add images by committing them to the repo.
 
 ## Upgrading
 
-* Back up `/usr/local/www/ikiwiki-srcdir/`, `/usr/local/www/ikiwiki-repo.git/`, `/usr/pkg/share/ikiwiki/templates/`, and `/usr/local/etc/ikiwiki.setup`, just to be safe.
-* Save `/usr/pkg/share/ikiwiki/basewiki/favicon.ico` and `/usr/pkg/share/ikiwiki/basewiki/local.css` separately.  These will need to be restored after upgrade, as they're modified from what comes with the ikiwiki package.
-* Upgrade.  Delete/rebuild or pkg_rolling-replace or whatever.
+* Back up `/usr/local/www/ikiwiki-srcdir/`, `/usr/local/www/ikiwiki-repo.git/`, `/usr/local/share/ikiwiki/templates/`, and `/usr/local/etc/ikiwiki.setup`, just to be safe.
+* Save `favicon.ico`, `local.css`, and `style.css` in `/usr/local/share/ikiwiki/basewiki/` separately.  These will need to be restored after upgrade, as they're modified from what comes with the ikiwiki package.  You may also have to save `local.css` and `style.css` in `/usr/local/www/www.dragonflybsd.org/` as well.
+* Upgrade using dports.
 * Run any ikiwiki transition commands mentioned in the release notes at http://ikiwiki.info/news/ .
 * Check for any new plugins that could be enabled; place them in the ikiwiki.setup file.
 * textproc/p5-Search-Xapian and textproc/xapian-omega is needed for the search engine, and the path to the omega CGI listed in ikiwiki.setup, though this should never be needed for a separate install unless rebuilding everything.