From dfdbbd19be254f7c9f77449beced606cde6a69ea Mon Sep 17 00:00:00 2001 From: wainstead Date: Sun, 26 Aug 2001 17:00:50 +0000 Subject: [PATCH] Fixed some bugs in the page source in the "Emphasis" section. git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@545 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- pgsrc/TextFormattingRules | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/pgsrc/TextFormattingRules b/pgsrc/TextFormattingRules index be6bdd700..d2f010b89 100644 --- a/pgsrc/TextFormattingRules +++ b/pgsrc/TextFormattingRules @@ -31,7 +31,6 @@ This is not !Indented Paragraphs -''(Quotes)'' * semicolon-colon -- works like
@@ -39,8 +38,8 @@ This is not ! Emphasis -* Use doubled single-quotes ('') for emphasis (usually ''italics'') -* Use doubled underscores (__) for strong emphasis (usually __bold__) +* Use doubled single-quotes ('____') for emphasis (usually ''italics'') +* Use doubled underscores (_''''_) for strong emphasis (usually __bold__) * Mix them at will: __''bold italics''__ * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries: @@ -50,27 +49,12 @@ will not work'' ! References * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred) * Hyperlinks to external pages are done like this: [http://www.wcsb.org/] -* You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | HomePage] +* You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | FrontPage] * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/ -* You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart. (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].) +* [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page. * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/ * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png] -! Tables - -* Simple tables are available. A table row is introduced by a __|__ in the first column. It is best described by example: - || _''''_Name_''''_ |v _''''_Cost_''''_ |v _''''_Notes_''''_ - | _''''_First_''''_ | _''''_Last_''''_ - |> Jeff |< Dairiki |^ Cheap |< Not worth it - |> Marco |< Polo | Cheaper |< Not available -;: will generate -|| __Name__ |v __Cost__ |v __Notes__ -| __First__ | __Last__ -|> Jeff |< Dairiki |^ Cheap |< Not worth it -|> Marco |< Polo | Cheaper |< Not available - -;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows. A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.) - ! HTML Mark-Up Language @@ -78,14 +62,3 @@ will not work'' * < and > are themselves * The & characters will not work * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default. - -! More detail than you want to know - -See [MagicPhpWikiURLs] for gory details on how to write -various kind of wiki maintainance links. - ------ - -Footnotes: - -[1] By using [[1] a second time (in the first column) the footnote itself is ''defined''. You may refer to a footnote as many times as you want, but you may only define it once on the page. Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references. (References which come ''after'' the footnote ''definition'' will not be linked to.) -- 2.45.0