Merge branch 'ikiwiki'

4 files changed, 13 insertions, 7 deletions

diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index fe1af4c..0f298ad 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -51,7 +51,8 @@ Some more elaborate limits can be added to what matches using these functions:
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
-  specified IP address.
+  specified IP address. Glob patterns can be used in the address. For
+  example, `ip(127.0.0.*)`
 * "`comment(glob)`" - matches comments to a page matching the glob.
 * "`comment_pending(glob)`" - matches unmoderated, pending comments.
 * "`postcomment(glob)`" - matches only when comments are being 
diff --git a/sandbox.mdwn b/sandbox.mdwn
index e76bdb8..c66534f 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -30,5 +30,3 @@ Bulleted list
 * item
 
 [[ikiwiki/WikiLink]]
-
-[[!calendar type="month" pages="blog/*"]]
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 722c6b1..b4f6d8e 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -7,7 +7,7 @@ Some examples of using shortcuts include:
 	\[[!google foo]]
 	\[[!wikipedia War_of_1812]]
 	\[[!debbug 12345]]
-	Check the \[[!cia ikiwiki desc="CIA page for %s"]].
+	Check the \[[!google ikiwiki desc="google search for %s"]].
 
 This page controls what shortcut links the wiki supports.
 
@@ -54,8 +54,6 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
 * [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
-* [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
-* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
 * [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]
diff --git a/style.css b/style.css
index 6e2afce..067a3bf 100644
--- a/style.css
+++ b/style.css
@@ -58,7 +58,8 @@ nav {
 	border-bottom: 1px solid #000;
 }
 
-.inlinecontent {
+.inlinecontent,
+.inlineenclosure {
 	margin-top: .4em;
 }
 
@@ -202,6 +203,13 @@ div.recentchanges {
 	margin-top: 1em;
 }
 
+.archivepagedate {
+	font-style: italic;
+}
+.archivepage {
+	margin-bottom: 1em;
+}
+
 .error {
 	color: #C00;
 }
@@ -316,6 +324,7 @@ div.progress-done {
 .popup .paren,
 .popup .expand {
 	display: none;
+	text-align: left;
 }
 .popup:hover .balloon,
 .popup:focus .balloon {