#
#
# add_file "wiki/ikiwikimigration.mdwn"
#  content [f554ca72f2e8b80307ddf43c24bb8633e4d7da32]
# 
# patch ".mtn-ignore"
#  from [52d80a4d035c9e98f20b860d0a5c223423bf2f53]
#    to [f9cfe425753704d655fc473b069b58e724121b28]
# 
# patch "wiki/ZipperMerge.mdwn"
#  from [bf20bb215fd566666d17d210ddda20ea10c2c64f]
#    to [046b51d28bb8eebafb7062cbfea6a2c24ecc92bf]
# 
# patch "wiki.mdwn"
#  from [7eb06f75dbfa665a2c5a6c49b2e134a9a36e381d]
#    to [92956fee348312b1d3f0f713e0f44b1c8d72530b]
#
============================================================
--- wiki/ikiwikimigration.mdwn	f554ca72f2e8b80307ddf43c24bb8633e4d7da32
+++ wiki/ikiwikimigration.mdwn	f554ca72f2e8b80307ddf43c24bb8633e4d7da32
@@ -0,0 +1,42 @@
+# How to migrate pages to ikiwiki
+
+1. fetch the page you're going to migrate, in raw original moinmoin
+   markup style, into the workspace, and commit it as is for
+   reference. (adjust as needed for some other tool, like wget or curl).
+
+        ftp -o ZipperMerge.moin "http://www.venge.net/mtn-wiki/ZipperMerge?action=raw"
+        mtn add ZipperMerge.moin
+        mtn commit
+
+2. rename the file and begin the process of migrating the markup
+
+        mtn mv ZipperMerge.moin ZipperMerge.mdwn
+
+   start by adding `\[[tag migration-wip]]` at the top of the file.
+   This tags the page as one being worked on, but not yet finished.
+
+3. Translate the markup:
+
+    * headers are done with leading `#` `##` etc rather than
+      surrounding `==` etc
+
+    * *some* and **more** emphasis is done with `*` rather than lots
+      of single-quotes
+
+    * Links are done with `\[[SquareBrackets]]` rather than bare
+      `CamelCaseWords` 
+
+    * preformatted code blocks are done with 4 more spaces (inside the
+      current level of indentation, say when inside nested lists),
+      rather than with  `{{{` and `}}}`
+
+    * use [[ikiwiki/formatting]] to help, and add more notes here
+
+4. Generate, test, rinse, repeat.  `commit` now and again if you like,
+   because your page is still tagged as unfinished.
+
+5. When you're happy, change to `\[[tag migration-done]]`, save and
+   commit again.
+
+6. `GOTO 1`
+
============================================================
--- .mtn-ignore	52d80a4d035c9e98f20b860d0a5c223423bf2f53
+++ .mtn-ignore	f9cfe425753704d655fc473b069b58e724121b28
@@ -1,4 +1,4 @@
-.ikiwiki
+^\.ikiwiki
 figures/.*\.pdf$
 semantic\.cache$
 _analog\.html
============================================================
--- wiki/ZipperMerge.mdwn	bf20bb215fd566666d17d210ddda20ea10c2c64f
+++ wiki/ZipperMerge.mdwn	046b51d28bb8eebafb7062cbfea6a2c24ecc92bf
@@ -1,10 +1,10 @@
 [[!toc levels=2]]
 [[tag migration-done]]
 
-Zipper Merge is a BestPractices workflow pattern that uses the DAG
+Zipper Merge is a [[BestPractices]] workflow pattern that uses the DAG
 structure to help simplify large complex merges.
 
-It's an application of the same principles used by the DaggyFixes
+It's an application of the same principles used by the [[DaggyFixes]]
 pattern, but for the scenario where you want to merge two branches
 together, rather than make the same change to two branches that must
 remain separate otherwise. 
@@ -141,14 +141,14 @@ each of the small merges. 
 A good interactive merge assistance tool is also invaluable for 
 each of the small merges. 
 
-See InterfacesFrontendsAndTools for tools that can help with both.
+See [[InterfacesFrontendsAndTools]] for tools that can help with both.
 
 # Usage comments and notes for further development
 
 (please add comments of your own here, too)
 
 There is another style of merging under development that will allow 
-a different approach to the same problem. This is known as a workspace merge, or MergeViaWorkingDir
+a different approach to the same problem. This is known as a workspace merge, or [[MergeViaWorkingDir]]
 and is a different user interface to the underlying merge algorithms.
 
 Zipper Merge has the advantage of being available now. But even when we 
============================================================
--- wiki.mdwn	7eb06f75dbfa665a2c5a6c49b2e134a9a36e381d
+++ wiki.mdwn	92956fee348312b1d3f0f713e0f44b1c8d72530b
@@ -1,6 +1,6 @@
 [[!toc ]]
 
-This is a temporary wiki front page, for the migration-in-progress of
+This is a temporary wiki front page, for the [[ikiwikimigration]] of 
 the monotone wiki. It helps track progress.  Whether or not there will
 be a 'normal' wiki homepage later (as separate from the main front
 page) will be determined later.