Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

documentation: update markup reference

  • Loading branch information...
commit 32c66b0e2ad10073fdfa2f6cd90da48373c63cb9 1 parent ecca90b
@jediwhale jediwhale authored
View
2  FitNesseRoot/FitNesse/UserGuide/MarkupAliasLink/content.txt
@@ -3,7 +3,7 @@ You can take any word, phrase, or image and turn it into a link using the follow
|!c Markup Text|!c Displayed as:|
|!-click [[here][.FrontPage]].-!|click [[here][.FrontPage]].|
-|!-[[!img http://www.objectmentor.com/images/omLogo][http://www.objectmentor.com]]-!|[[!img http://www.objectmentor.com/images/omlogo][http://www.objectmentor.com]]|
+|!-[[!img http://objectmentor.com/Images/OMI_HeaderArea_Logo.png][http://www.objectmentor.com]]-!|[[!img http://objectmentor.com/Images/OMI_HeaderArea_Logo.png][http://www.objectmentor.com]]|
|!-[[''Recent Changes''][RecentChanges]]-!|[[''Recent Changes''][.RecentChanges]]|
* When the text is a wiki word, the link to the wiki word takes precedence, so you cannot override one wiki word to link to another.
View
1  FitNesseRoot/FitNesse/UserGuide/MarkupAliasLink/properties.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<properties>
<Files/>
- <LastModified>20090327101750</LastModified>
<RecentChanges/>
<WhereUsed/>
<saveId>1238167070532</saveId>
View
15 FitNesseRoot/FitNesse/UserGuide/MarkupHelp/content.txt
@@ -0,0 +1,15 @@
+We can display the help text that's been defined for the current page:
+
+!-!help-!
+
+displays as:
+
+!help
+
+We can also make a link to edit the page properties.
+
+!-!help -editable-!
+
+displays as:
+
+!help -editable
View
12 FitNesseRoot/FitNesse/UserGuide/MarkupHelp/properties.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<properties>
+ <Edit>true</Edit>
+ <Files>true</Files>
+ <Help>This is the help text for the markup help page.</Help>
+ <Properties>true</Properties>
+ <RecentChanges>true</RecentChanges>
+ <Refactor>true</Refactor>
+ <Search>true</Search>
+ <Versions>true</Versions>
+ <WhereUsed>true</WhereUsed>
+</properties>
View
3  FitNesseRoot/FitNesse/UserGuide/MarkupLanguageReference/content.txt
@@ -26,9 +26,10 @@ The FitNesse markup language is straightforward to learn, and powerful enough to
|[[Tables][MarkupTable]]|''Creating tables.''|
|[[Hash Tables][MarkupHashTable]]|''Creating lookup tables.''|
|[[Plain Text Tables][PlainTextTable]]|''Creating tables from plain text without vertical strokes''|
+|[[Collapsable Sections][MarkupCollapsableSection]]|''Making a section of content collapsable and expandable''|
|[[Table of Contents][MarkupContents]]|''Generate a table of contents for a SubWiki.''|
|[[Including][MarkupPageInclude]]|''Pulling the content from one page into another.''|
+|[[Help][MarkupHelp]]|''Displaying the help property for the page.''|
|[[Last Modification Time][LastModificationTime]]|''Showing the time that a page was last modified.''|
-|[[Collapsable Sections][MarkupCollapsableSection]]|''Making a section of content collapsable and expandable''|
|[[Today's Date][TodaysDate]]|''Showing todays date in various formats and styles.''|
|[[Nesting][MarkupNesting]]|''Nesting markup within other markup elements.''|
View
9 FitNesseRoot/FitNesse/UserGuide/MarkupLiteralText/content.txt
@@ -7,12 +7,3 @@ Any text enclosed in '''!-!--!''' and '''-!''' will be treated as a literal and
|!-!-'''bold'''-!-!|!-'''bold'''-!|
|!-!-&lt;i&gt;hello&lt;/i&gt;-!-!|!-<i>hello</i>-!|
-If you want to show HTML rather than have it rendered you can surround it in &bang;< and >&bang;
-
-|!c '''Markup Text'''|!c '''Displays as'''|
-|&bang;<<i>hello</i>>&bang;|!-&lt;i&gt;hello&lt;/i&gt;-!|
-
-
-
-
-
View
2  FitNesseRoot/FitNesse/UserGuide/MarkupLiteralText/properties.xml
@@ -2,12 +2,10 @@
<properties>
<Edit/>
<Files/>
- <Help></Help>
<Normal/>
<Properties/>
<RecentChanges/>
<Refactor/>
- <Suites></Suites>
<Versions/>
<WhereUsed/>
<saveId>1225603481926</saveId>
View
16 FitNesseRoot/FitNesse/UserGuide/MarkupNesting/content.txt
@@ -20,4 +20,20 @@ is displayed as a single table.
|this|table|
|has| |a|nested|table| |
+Nesting always creates a 'virtual' new line, so elements that must start on a new line can be nested within other content.
+
+!-This line has !(!note a nested note)! within.-!
+
+displays as:
+
+This line has !(!note a nested note)! within.
+
+Without nesting:
+
+!-This line has !note a nested note within.-!
+
+displays as:
+
+This line has !note a nested note within.
+
View
2  FitNesseRoot/FitNesse/UserGuide/MarkupPicture/content.txt
@@ -3,7 +3,7 @@ As a shortcut, any URL ending in '''.gif''' or '''.jpg''' will also be included
|!c '''Markup Text'''|!c '''Displayed as:'''|
|{{{!img http://files/fitnesse/images/FitNesseLogo.png}}}|!img http://files/fitnesse/images/FitNesseLogo.png|
-|{{{http://files/fitnesse/images/FitNesseLogo.png}}}|!img http://files/fitnesse/images/FitNesseLogo.png|
+|{{{http://files/fitnesse/images/fitnesse_architecture.jpg}}}|http://files/fitnesse/images/fitnesse_architecture.jpg|
You may align images to the left or right and wrap following text around the images by using '''!img-l''' and '''!img-r''' respectively.
View
1  FitNesseRoot/FitNesse/UserGuide/MarkupPicture/properties.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<properties>
<Files/>
- <Help></Help>
<RecentChanges>true</RecentChanges>
<WhereUsed/>
</properties>
View
12 FitNesseRoot/RecentChanges/content.txt
@@ -1,5 +1,9 @@
-|FitNesse.UserGuide.MarkupNesting||13:30:46 Thu, May 03, 2012|
-|FitNesse.UserGuide.MarkupLanguageReference||13:15:44 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupPicture||18:28:18 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupHelp||16:49:49 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupLanguageReference||16:44:14 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupLiteralText||16:37:28 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupAliasLink||16:28:06 Thu, May 03, 2012|
+|FitNesse.UserGuide.MarkupNesting||14:12:37 Thu, May 03, 2012|
|FitNesse.SuiteAcceptanceTests.SuiteFitDecoratorTests.TimedMultipleDivision||09:57:57 Sun, Apr 01, 2012|
|FitNesse.SuiteAcceptanceTests.SuiteFitDecoratorTests.TimeRangeDivision||09:57:18 Sun, Apr 01, 2012|
|FitNesse.SuiteAcceptanceTests.SuiteFitDecoratorTests.MultipleDivision||08:29:49 Sun, Apr 01, 2012|
@@ -94,7 +98,3 @@
|FitNesse.SuiteAcceptanceTests.SuiteSlimTests.LibrarySuite.LastLibraryPreceedsEarlierLibraryTest||17:29:38 Sun, Jan 17, 2010|
|JunkPage.CommentTableBug||17:08:18 Sun, Jan 17, 2010|
|JunkPage.NestedTablesInSymbols||08:34:44 Wed, Jan 06, 2010|
-|FitNesse.SuiteAcceptanceTests.SuiteWikiImportTests.TestWaterMarkAndEditButtons||08:29:35 Wed, Jan 06, 2010|
-|FitNesse.SuiteAcceptanceTests.SuiteWikiImportTests.SetUp||08:28:18 Wed, Jan 06, 2010|
-|JunkParent.SuiteTearDown||08:11:18 Mon, Jan 04, 2010|
-|JunkParent.SuiteSetUp||08:11:04 Mon, Jan 04, 2010|

0 comments on commit 32c66b0

Please sign in to comment.
Something went wrong with that request. Please try again.