updates from src

diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn
index d300736a86b9a6feb5c673aae30a4c15d129f45d..9c490fcb3ebdd597e22fe83880dd31a459f193ea 100644 (file)
--- a/basewiki/blog.mdwn
+++ b/basewiki/blog.mdwn
@@ -1,8 +1,22 @@
 You can turn any page on this wiki into a weblog by inserting a
 [[PostProcessorDirective]]. Like this:
 
-\\[[inline pages="blog/*" show="10"]]
+\\[[inline pages="blog/* !*/Discussion" show="10" rootpage="blog"]]
 
-Any pages that match the specified [[GlobList]] (in the exaple, any
-[[SubPages]] of "blog") will be part of the blog, and the newest 10
+Any pages that match the specified [[GlobList]] (in the example, any
+[[SubPage]] of "blog") will be part of the blog, and the newest 10
 of them will appear in the page.
+
+The optional `rootpage` setting tells the wiki that new posts to this blog
+should default to being [[SubPage]] of "blog", and enables a form at the
+top of the blog that can be used to add new items.
+
+If you want your blog to have an archive page listing every post ever made
+to it, you can accomplish that like this:
+
+\\[[inline pages="blog/* !*/Discussion" archive="yes"]]
+
+You can even create an automatically generated list of all the pages on the
+wiki, with the most recently added at the top, like this:
+
+\\[[inline pages="* !*/Discussion" archive="yes"]]

diff --git a/basewiki/markdown.mdwn b/basewiki/markdown.mdwn
index 9a0fff1980e871d9c45d3c21b3f39462e8c78036..3684fe5c1cb9fd9d24a4f196b847c8e65438c10b 100644 (file)
--- a/basewiki/markdown.mdwn
+++ b/basewiki/markdown.mdwn
@@ -2,8 +2,7 @@
 is a minimal markup language that resembles plain text as used in
 email messages. It is the markup language used by this wiki.
 
-For documentation about the markdown syntax, see
+For documentation about the markdown syntax, see [[HelpOnFormatting]] and
 [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
 
-Note that [[WikiLink]]s are not part of the markdown syntax, and are the
-only bit of markup that this wiki handles internally.
+Note that [[WikiLink]]s and [[PostProcessorDirective]]s are not part of the markdown syntax, and are the only bit of markup that this wiki handles internally.

diff --git a/basewiki/style.css b/basewiki/style.css
index 82a01d8a05a1a437995d1ed934944499424c1413..97b30fbf86b62854d17606665af931cae0df6788 100644 (file)
--- a/basewiki/style.css
+++ b/basewiki/style.css
@@ -23,6 +23,7 @@
 #blogform {
        padding: 10px 10px;
        border: 1px solid #aaa;
+       color: black !important;;
        background: #eee;
 }
 
@@ -41,11 +42,12 @@
 /* Used for invalid form fields. */
 .fb_invalid {
        color: red;
+       background: white !important;
 }
 
 /* Used for required form fields. */
 .fb_required {
-       fornt-style: bold;
+       font-weight: bold;
 }
 
 /* RSS button. */
@@ -64,5 +66,6 @@
        margin-top: 1em;
 }
 .rssbutton:hover {
+       color: white !important;
        background: #ff9900;
 }

diff --git a/basewiki/wikilink.mdwn b/basewiki/wikilink.mdwn
index ac0ec9d564d84ba0e4688f9ff2fd54cdf351b202..6051fe1206bf6a706b76c227084c0f46d392e9b0 100644 (file)
--- a/basewiki/wikilink.mdwn
+++ b/basewiki/wikilink.mdwn
@@ -13,3 +13,7 @@ always lowercased.
 
 Note that if the file linked to by a WikiLink looks like an image, it will
 be displayed inline on the page.
+
+It's also possible to write a WikiLink that uses something other than the
+page name as the link text. For example "\[[foo|SandBox]]" links to the
+SandBox page, but the link will appear like this: [[foo|SandBox]]