t/git-cgi.t: fix race condition

[git.ikiwiki.info.git] / doc / tips / embedding_content.mdwn

diff --git a/doc/tips/embedding_content.mdwn b/doc/tips/embedding_content.mdwn
index 666f4dab36c08b2c2c7f8778b0597c04073d3b47..bfe458a842b0eccdbd66ba15ff86a5a9ace3ab0e 100644 (file)
--- a/doc/tips/embedding_content.mdwn
+++ b/doc/tips/embedding_content.mdwn
@@ -5,9 +5,9 @@ they can be abused in many evil ways.
 
 Some plugins have been written to try to work around this problem, by
 whitelisting the html needed to embed things from a few sites like Google
-calendar, videos, and YouTube. The problem with these plugins is that they
-have to be kept up to date to add new sites, and follow changes to the html
-such sites use for embedding.
+maps, calendar, videos, and YouTube. The problem with these plugins is that
+they have to be kept up to date to add new sites, and follow changes to the
+html such sites use for embedding.
 
 (Digression: The real problem with the plugins is that they hide the
 underlying trust relationship. If you decide to embed html from a site,
@@ -15,7 +15,7 @@ you'd better trust that site. And if ikiwiki lets you enter such html, it
 needs to trust you.)
 
 The [[plugins/htmlscrubber]] offers a different way around this problem.
-You can configure it to skip scrubbing certian pages, so that content from
+You can configure it to skip scrubbing certain pages, so that content from
 elsewhere can be embedded on those pages. Then use [[plugins/lockedit]]
 to limit who can edit those unscrubbed pages.