aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/dal_syntax.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-04-27 19:43:49 -0400
committerRalph Amissah <ralph@amissah.com>2010-04-27 19:43:49 -0400
commit32fac381f59adf99295fdd73f96b22737d714a0b (patch)
tree671e38fe7805160a24a3a0b317cdcaecf7483b6a /lib/sisu/v2/dal_syntax.rb
parentdebian/changelog (2.2.0-1), debian/NEWS.Debian (diff)
parentupdate: changelog, version (2.3.0) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/dal_syntax.rb')
-rw-r--r--lib/sisu/v2/dal_syntax.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v2/dal_syntax.rb b/lib/sisu/v2/dal_syntax.rb
index 4a13b069..b7b9ec4b 100644
--- a/lib/sisu/v2/dal_syntax.rb
+++ b/lib/sisu/v2/dal_syntax.rb
@@ -215,8 +215,8 @@ module SiSU_Syntax
def bodymarkup(dob)
# << http://www.jus.uio.no/sisu/sisu_markup_table/markup >>
# See: data/sisu/sample/document_samples_sisu_markup/
- # !{emphasis}! e{emphasis}e <strong>emphasis</strong>
- # *{bold text}* b{bold}b <b>bold text</b>
+ # *{emphasis}* e{emphasis}e <strong>emphasis</strong>
+ # !{bold text}! b{bold}b <b>bold text</b>
# _{underline}_ u{underline}u <u>underline</u>
# /{italics}/ i{italics}i <i>italics</i>
# "{citation}" c{citation}c <cite>citation</cite> #blockquote?
@@ -411,8 +411,8 @@ module SiSU_Syntax
dob
end
def tech #script markup planned to be more strict for technical documents
- # !{emphasis}! e{emphasis}e <strong>emphasis</strong>
- # *{bold text}* b{bold}b <b>bold text</b>
+ # *{emphasis}* e{emphasis}e <strong>emphasis</strong>
+ # !{bold text}! b{bold}b <b>bold text</b>
# _{underline}_ u{underline}u <u>underline</u>
# /{italics}/ i{italics}i <i>italics</i>
# "{citation}" c{citation}c <cite>citation</cite>