diff options
| author | intrigeri <intrigeri@boum.org> | 2009-08-27 19:56:37 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-08-27 19:56:37 +0200 |
| commit | 0c032b0ccb3766c422980a0e956dacbe44cfa021 (patch) | |
| tree | 3f7d5d2821fee7f336bdabfa56e71f7048e77569 /doc/ikiwiki | |
| parent | 496e8523c6706d096f1b794e3f3ba5dd2fa260f3 (diff) | |
| parent | 5e515b493c00c70095aeb8bad1e0b7757ed943db (diff) | |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'doc/ikiwiki')
| -rw-r--r-- | doc/ikiwiki/formatting.mdwn | 2 | ||||
| -rw-r--r-- | doc/ikiwiki/searching.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 2ed5cc26f..befbce9aa 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this: Leave blank lines between paragraphs. -You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it +You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it in single or double asterisks. To create a list, start each line with an asterisk: diff --git a/doc/ikiwiki/searching.mdwn b/doc/ikiwiki/searching.mdwn index 539e7193d..4c1287933 100644 --- a/doc/ikiwiki/searching.mdwn +++ b/doc/ikiwiki/searching.mdwn @@ -5,7 +5,7 @@ then="This wiki has searching **enabled**." else="This wiki has searching **disabled**."]] If searching is enabled, you can enter search terms in the search field, -as you'd expect. There are a few special things you can do to constuct +as you'd expect. There are a few special things you can do to construct more powerful searches. * To match a phrase, enclose it in double quotes. |