changeset 1405:0b947dbdffe8

docs: use rather contenttype instead of mimetype as this is the real metadata key
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 25 Jun 2012 12:29:04 +0200
parents 83d04b38b8fa
children aa79e8413d9c
files docs/devel/development.rst docs/user/markups.rst
diffstat 2 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/docs/devel/development.rst	Mon Jun 25 12:24:49 2012 +0200
+++ b/docs/devel/development.rst	Mon Jun 25 12:29:04 2012 +0200
@@ -113,8 +113,8 @@
   - creates an in-memory Item
 
     + by fetching the item of name "WikiItem" from storage
-    + it looks at the mimetype of this item, which is stored in the metadata
-    + it creates an appropriately typed Item instance, depending on the mimetype
+    + it looks at the contenttype of this item, which is stored in the metadata
+    + it creates an appropriately typed Item instance, depending on the contenttype
   - calls Item._render_data() to determine what the rendered item looks like
     as HTML
   - renders the `show_item.html` template and returns the rendered item html
@@ -143,17 +143,18 @@
 -------------------------
 How does moin know what the HTML rendering of an item looks like?
 
-Each Item has some mimetype that is stored in the metadata, also called the input mimetype.
-We also know what we want as output, also called the output mimetype.
+Each Item has some contenttype that is stored in the metadata, also called the input contenttype.
+We also know what we want as output, also called the output contenttype.
 
 Moin uses converters to transform the input data into the output data in
 multiple steps. It also has a registry that knows all converters and their supported
-input and output mimetypes.
+input and output mimetypes / contenttypes.
 
-For example, if the mimetype is `text/x-moin-wiki`, it will find that the input
-converter handling this is the one defined in `converter.moinwiki_in`. It then
-feeds the data of this item into this converter. The converter parses this
-input and creates an in-memory `dom tree` representation from it.
+For example, if the contenttype is `text/x-moin-wiki;charset=utf-8`, it will
+find that the input converter handling this is the one defined in
+`converter.moinwiki_in`. It then feeds the data of this item into this
+converter. The converter parses this input and creates an in-memory `dom tree`
+representation from it.
 
 This dom tree is then transformed through multiple dom-to-dom converters for example::
 
--- a/docs/user/markups.rst	Mon Jun 25 12:24:49 2012 +0200
+++ b/docs/user/markups.rst	Mon Jun 25 12:29:04 2012 +0200
@@ -18,7 +18,7 @@
 .. _MediaWiki: http://www.mediawiki.org/wiki/Help:Formatting
 
 In Moin2, you specify the item's markup language when you create the document. 
-Its markup language can also be changed at any time by modifying the item's ``mimetype`` metadata. 
+Its markup language can also be changed at any time by modifying the item's ``contenttype`` metadata. 
 Currently Moin2 supports `MoinWiki`_, `WikiCreole`_, `reStructuredText`_, `Docbook`_ and `MediaWiki`_ markups.
 
 **MOINTODO**: Currently the use of ``{{{#!syntax content}}}`` parsers crashes moin.