Add changes from giskard

diff --git a/AbridgedResume b/AbridgedResume
index b9c4ffcb9e71ced53dbb94bded41386e67e7b208..a48c948dd4e943b5e5154d29ff89c6c5309e6548 100644 (file)
--- a/AbridgedResume
+++ b/AbridgedResume
@@ -46,7 +46,7 @@ Please contact me by e-mail only: bernie@codewiz.org
  * Working on funding, partnerships and events.
 
 ==== Volunteer developer for One Laptop Per Child (May 2007 to Apr 2008) ====
- * CTO of OLPC Europe;
+ * CTO at OLPC Europe;
  * In-house maintainer of the X11 windowing system;
  * i18n, input devices and keyboard layouts;
  * Miscellaneous OS development, packaging, release engineering;

diff --git a/BrainDump b/BrainDump
index 427f047cc5f9f13c9c64c695c313f7a1cafc64f3..2b81133714da71610977a08ed1500a2ccbc25ec3 100644 (file)
--- a/BrainDump
+++ b/BrainDump
@@ -30,4 +30,4 @@
 
 [[http://technorati.com/claim/zjkey8wjs8 | Technorati Profile]]
 
-[[http://technorati.com/faves?sub=addfavbtn&add=http://www.codewiz.org/wiki/BrainDump | Add to Technorati Favorites]]
\ No newline at end of file
+[[http://technorati.com/faves?sub=addfavbtn&add=http://www.codewiz.org/wiki/BrainDump | Add to Technorati Favorites]]

diff --git a/ContactInformation b/ContactInformation
index 1a336ace4ee76ffc93d8738488333f542dd593db..af1dae51c13d87e16d5ac08657da706f5d69f644 100644 (file)
--- a/ContactInformation
+++ b/ContactInformation
@@ -4,7 +4,7 @@
  * Home page: http://www.codewiz.org/
  * IRC: ##_bernie## on ##irc.freenode.org## (often online)
  * Jabber: bernie-nospam@codewiz.org (**remove -nospam**)
- * OpenID: http://www.codewiz.org/wiki/
+ * OpenID: http://www.codewiz.org/
  * Public SSH keys: https://www.develer.com/~bernie/authorized_keys
  * Public GPG key: ##71FF4BAC##: https://www.develer.com/~bernie/gpgkey.txt
  * Snail mail:

diff --git a/CurrentOccupation b/CurrentOccupation
index 396a9d3dbf7e0ca8088da59bc86aac5647973c33..b8aaf9881391c5bee5f95d8ab756f6827dd3a3de 100644 (file)
--- a/CurrentOccupation
+++ b/CurrentOccupation
@@ -5,7 +5,7 @@ organization developing a free constructionist learning environment for
 low-age children.
 
 I'm an elected member of the Oversight Board and run the
-[[http://sugarlabs.org/go/InfrastructureTeam | Infrastructure Team]] along
+[[http://sugarlabs.org/go/InfrastructureTeam | Infrastructure Team]], along
 with other CTO-like duties.
 
 === Previous occupations ===

diff --git a/EditingTips b/EditingTips
index 0a95db6eaea4929ca12a53332fbb9111c9155b9b..045579605b3e3adee4c07251074b4ba4740efab8 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -23,6 +23,13 @@ Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local pa
 
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
+== Macros ==
+
+<<TitleSearch>>
+<<NonexistentMacro | param1 | param2 >>
+
+Included text: <<Include | IncludedPage>>
+
 == Block elements ==
 
 Leave blank lines between paragraphs.

diff --git a/FindPage b/FindPage
index e31b222db94eb07b63cc89dfc9108b4a662b403a..eb6cd33fe960db22fdeb29bae78d40e6584386a2 100644 (file)
--- a/FindPage
+++ b/FindPage
@@ -6,13 +6,20 @@ Here are some good starting points for browsing:
  * TitleIndex -- all pages in the database
  * WordIndex -- all words in all titles
 
-Here's a title search.  Try something like ''wiki'':
+Here's a title search.  Try something like //wiki//:
 
- <<TitleSearch>>
+ <<HttpGet|search>>
+ <form method="get">
+   <input name="titlesearch" size="30" value="<<HttpGet|search>>" />
+   <input type="submit" value="Search" />
+ </form>
 
 Here's a full-text search:
 
- <<FullSearch>>
+ <form method="get">
+   <input name="fullsearch" size="30" value="<<HttpGet|search>>" />
+   <input type="submit" value="Search" />
+ </form>
 
 You can also use regular expressions, such as
 

diff --git a/InvestorWork b/InvestorWork
index 347d016196aa4109398270ed36f8f28a9d9fb8f1..30b9bc6af63ddab717b358b6f2c59c76be89c16f 100644 (file)
--- a/InvestorWork
+++ b/InvestorWork
@@ -5,4 +5,4 @@ I've been investing in two startup companies:
  * DevelerCompany - co-founder in November 2001. Owner of 50% shares
  until April 2007, currently 20%.
 
- * SugarLabsFoundation - co-founder in November 2008.  Currently an elected member of the Sugar Labs Oversight Board (SLOB ;-)
\ No newline at end of file
+ * SugarLabsFoundation - co-founder in November 2008.  Currently an elected member of the Sugar Labs Oversight Board (SLOB ;-)

diff --git a/May2008Blog b/May2008Blog
index c34aa2ddfbb19a29811f1c7931b5422cdc6c641f..3a7055390f3145147fef2936dcbd7d2784945a99 100644 (file)
--- a/May2008Blog
+++ b/May2008Blog
@@ -5,14 +5,13 @@
 
 ==== Linux Tag ====
 
-The whole Sugar Labs team attended Linux Tag:
+The whole SugarLabs team attended LinuxTag:
 
 
-
-More pictures: http://www.skolelinux.de/~ralf/LT2008/
+More pictures: [[http://www.skolelinux.de/~ralf/LT2008/]]
 
 === Wed, 7th ===
 
 ==== SugarLabs ====
 
-We are working to make Sugar an independent, decentralized, FreeSoftware project: http://www.sugarlabs.org/
\ No newline at end of file
+We are working to make Sugar an independent, decentralized, FreeSoftware project: http://www.sugarlabs.org/

diff --git a/RecentChanges b/RecentChanges
index 21c58a7414a4c0f8db6a3b3c9b7b6636addc00a1..26dc6ab7a177fc8992e394f74e6975eb5c044695 100644 (file)
--- a/RecentChanges
+++ b/RecentChanges
@@ -1 +1 @@
-[[RecentChanges]]
+<<RecentChanges>>

diff --git a/TitleIndex b/TitleIndex
index ad60a6d135a0b533510c75bd812376f7b78bdc16..23a912e045303205d462be7eb9bce80af808fb83 100644 (file)
--- a/TitleIndex
+++ b/TitleIndex
@@ -7,4 +7,4 @@ See also:
 
 ----
 
-<<TitleIndex>>
\ No newline at end of file
+<<TitleIndex>>

diff --git a/TwoHundredDollarLaptop b/TwoHundredDollarLaptop
index 8101b3f9a2c5535055d517c0955635effc000632..1a539241b3a964317f51618f050496fb1befc354 100644 (file)
--- a/TwoHundredDollarLaptop
+++ b/TwoHundredDollarLaptop
@@ -1,4 +1,4 @@
-#css ../wikidata/TwoHundredDollarLaptop.css
+#css TwoHundredDollarLaptop.css
 
 OneWindozePerChild.png
 

diff --git a/WordIndex b/WordIndex
index 496e3c5871d6ab45b9626774e091a2b36d46ce17..d4e92f85a896782781dde904741383e194d097ed 100644 (file)
--- a/WordIndex
+++ b/WordIndex
@@ -7,4 +7,4 @@ See also:
 
 ----
 
-[[WordIndex]]
\ No newline at end of file
+<<WordIndex>>

diff --git a/XorgOlpcTasks b/XorgOlpcTasks
index f4d9b35d56bf8e869fba421684157519eaa1c46b..f119503a43665751d0ff8cf1b28eb1935ad4ea5c 100644 (file)
--- a/XorgOlpcTasks
+++ b/XorgOlpcTasks
@@ -14,7 +14,7 @@ Things are also tracked here: http://dev.laptop.org/ticket/1604
 
 === DOING ===
 
- * Built-in fonts being removed from the font path on server reset. Worked it around with {{X -noreset}}.
+ * Built-in fonts being removed from the font path on server reset. Worked it around with ##X -noreset##.
 
 === TODO ===