summaryrefslogtreecommitdiff
path: root/doc/tips
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-01-13 12:26:43 +0100
committerintrigeri <intrigeri@boum.org>2009-01-13 12:26:43 +0100
commit82197bd0eaa216b841caace38c976acc7f6ad3fa (patch)
tree450f4afafb26d17a54c4917fb20d067c24efcaf7 /doc/tips
parentc8e3136d0091bd024e6dc1f3c21a10a92f2017d4 (diff)
parent7b1026b1a803e160c360ee8f4d19004b466f8b7c (diff)
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'doc/tips')
-rw-r--r--doc/tips/markdown_and_eclipse.mdwn4
-rw-r--r--doc/tips/upgrade_to_3.0.mdwn4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/tips/markdown_and_eclipse.mdwn b/doc/tips/markdown_and_eclipse.mdwn
new file mode 100644
index 000000000..9e8e9bfa9
--- /dev/null
+++ b/doc/tips/markdown_and_eclipse.mdwn
@@ -0,0 +1,4 @@
+For people that were not born with GNU emacs fingers,
+there is a markdown editor (with preview and outline)
+for [eclipse](http://www.eclipse.org) available
+[here](http://www.winterwell.com/software/markdown-editor.php).
diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index b8a75aeca..d22813bf2 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -37,8 +37,8 @@ following to your setup file:
prefix_directives => 0,
-To convert to the new syntax, run
-`ikiwiki-transition prefix_directives your.setup`
+To convert to the new syntax, make sure that your setup file does *not*
+contain the above, then run `ikiwiki-transition prefix_directives your.setup`
(And then commit the changes it makes to pages in your srcdir.)