| General Features | PhpWiki |
|---|---|
| System Requirements | PhpWiki |
| Datastorage | PhpWiki |
| Security/Anti-Spam | PhpWiki |
| Development/Support | PhpWiki |
| Common Features | PhpWiki |
| Special Features | PhpWiki |
| Links | PhpWiki |
| Syntax Features | PhpWiki |
| Usability | PhpWiki |
| Statistics | PhpWiki |
| Output | PhpWiki |
| Media and Files | PhpWiki |
| Extras | PhpWiki |
| Syntax Examples | PhpWiki |
WikiWord or [somelink] [ desc | pagename ] |
|
http://someserver/someurl [ desc | exturl ] |
|
!!!Headline1 !!Headline2 !Headline3 |
|
*bold* or <strong>bold</strong> |
|
_italics_ or or <em>italics</em> |
|
<u>underlined</u> |
|
<tt>monospace</tt> <code>code</code> <pre>preformatted</pre> <verbatim> unparsed text</verbatim> |
|
<strike>striked through</strike> |
|
<sup>above</sup> |
|
<sub>below</sub> |
|
[ http://foo.org/1.jpg size=30%] |
|
<?plugin RawHtml <span align="right"> ?>right<?plugin RawHtml </span> ?> or <div align="right"> right </div> |
|
;: left indent ;;: more left indent or |
|
* list |
|
# list |
|
Term:<def> |
|
---- |
This page belongs to the feature documentation of PhpWiki. The engine's features are listed in the table on the left. Detailed implementation details are available through the "i" icons right to the feature info.
This method is to use a conflict resolution technique which tries to solve conflict automatically. For example the two users may have edited different parts of the same page. A conflict resolution would simply merge both changes into the new page revision. However, there may be conflicts during a merge. The engine goes a step further and notifies the second user of the possible conflict and sometimes even shows parts colliding (using Revision diffs). The user then can choose to abort his save or merge manually (similar to the CVS mechanism).