diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:28:10 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:28:10 +0200 |
commit | 395db449b8c952f628a01cfd16787f1066f7bb7d (patch) | |
tree | 39a6c839b2e03ec519ec5afb03bf4d76cbd36d4d /ikiwiki/searching.mdwn | |
parent | 7fb1c12eb8ab54df0085bac0262ba73d5a858194 (diff) | |
parent | 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 (diff) |
Merge branch 'master' into master-noneditmaster-nonedit
Conflicts (manually resolved: text adjustments adopted, newly added files suppressed):
ikiwiki.mdwn
ikiwiki/directive.mdwn
ikiwiki/formatting.mdwn
ikiwiki/markdown.mdwn
ikiwiki/openid.mdwn
ikiwiki/pagespec.mdwn
ikiwiki/pagespec/attachment.mdwn
ikiwiki/subpage.mdwn
ikiwiki/wikilink.mdwn
index.mdwn
templates.mdwn
wikiicons/openidlogin-bg.gif
Diffstat (limited to 'ikiwiki/searching.mdwn')
-rw-r--r-- | ikiwiki/searching.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki/searching.mdwn b/ikiwiki/searching.mdwn index 539e719..4c12879 100644 --- a/ikiwiki/searching.mdwn +++ b/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. |