#
#
# patch "wiki/BranchNamingConventions.mdwn"
# from [87de000379acd21b16785fab77b9d1265ed12f82]
# to [61bfb4c46f49eb5e59988da0564dafeae9cd96c5]
#
# patch "wiki/ikiwiki_migration.mdwn"
# from [a39c1ff455f434a55467d7d48caeeb397c4ff541]
# to [5bd867b3499c6a6f3d13ff054fc594363ecd4a70]
#
============================================================
--- wiki/BranchNamingConventions.mdwn 87de000379acd21b16785fab77b9d1265ed12f82
+++ wiki/BranchNamingConventions.mdwn 61bfb4c46f49eb5e59988da0564dafeae9cd96c5
@@ -1,4 +1,4 @@
-[[!tag migration-auto]]
+[[!tag migration-wip]]
There are a number of ways to create **globally unique** branch names. There's some debate about which one is best.
============================================================
--- wiki/ikiwiki_migration.mdwn a39c1ff455f434a55467d7d48caeeb397c4ff541
+++ wiki/ikiwiki_migration.mdwn 5bd867b3499c6a6f3d13ff054fc594363ecd4a70
@@ -66,6 +66,19 @@ 3. Translate the markup. *Some of this m
few words in a paragraph, we don't get many
lines of sourounding diffs that are just reflowing.
+ * It seems like anchors must be coded in HTML. The recommendation
+ is to put the `Java style`
+
+ Not like this:
+
+ `## Java style`
+
+ or markdown might interpret the whole block as HTML only, not to
+ be processed.
+
4. Generate, test, rinse, repeat. `commit` now and again if you like,
because your page is still tagged as unfinished.