Size: 521
Comment:
|
Size: 305
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 9: | Line 9: |
[http://chianti.ucsd.edu/mes/basic_network.png] | |
Line 10: | Line 11: |
---- /!\ '''Edit conflict - other version:''' ---- [http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG] ##[attachment:basic_network.png] |
an attachment |
Line 14: | Line 13: |
---- /!\ '''Edit conflict - your version:''' ---- http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG ##[http://chianti.ucsd.edu/mes/BASIC_NETWORK.PNG] ##[attachment:basic_network.png] |
attachment:preferences_editor.png |
Line 19: | Line 15: |
---- /!\ '''End of edit conflict''' ---- |
[ [:DocBookTest/Introduction Introduction] |
This is a paragraph.
- This is a list
- still a list
Another paragraph
- a different kind of list
A title
A subtitle
- An image:
[http://chianti.ucsd.edu/mes/basic_network.png]
an attachment
attachment:preferences_editor.png
[ [:DocBookTest/Introduction Introduction]