"Moin Wiki" -> "MoinWiki" when referring to markup type

Author: ThomasWaldmann

docs/intro/features.rst

@@ -122,7 +122,7 @@ Wiki features
 
 Markup support
 --------------
-* Moin Wiki
+* MoinWiki
 * Creole
 * MediaWiki
 * reST

docs/user/moinwiki.rst

@@ -8,7 +8,7 @@
 
 
 ==========================
-Moin Wiki markup overview
+MoinWiki markup overview
 ==========================
 
 This document describes the features of the moinwiki markup language.
@@ -278,14 +278,14 @@ Lists
 =====
 
 .. warning::
- * All Moin Wiki list syntax (including that for unordered lists,
+ * All MoinWiki list syntax (including that for unordered lists,
    ordered lists and definition lists) requires a leading space before
    each item in the list.
  * Unfortunately, reStructuredText does not allow leading whitespace
    in code samples, so the example markup here will not work if copied
    verbatim, and requires
    that each line of the list be indented by one space in order to
-   be valid Moin Wiki markup.
+   be valid MoinWiki markup.
  * This is also an **reSTTODO**
 
 Unordered Lists
@@ -441,7 +441,7 @@ Definition Lists
  - reStructuredText does not support multiple definitions for a
    single term, so a line break has been forced to illustrate the
    appearance of several definitions.
- - Using the prescribed Moin Wiki markup will, in fact, produce two
+ - Using the prescribed MoinWiki markup will, in fact, produce two
    separate definitions in MoinMoin (using separate ``<dd>`` tags).
 
 Horizontal Rules

docs/user/templates_metadata.rst

@@ -30,12 +30,12 @@ will be copied to the modify form within the item creation dialog; note the `tem
 tag will not be copied. Users wanting to create a new template using an old
 template will need to re-enter the `template` tag.
 
-For templates with Moin Wiki markup, Predefined Variables can be used to insert
+For templates with MoinWiki markup, Predefined Variables can be used to insert
 date, time, username, item name, and others. See Predefined Variables
-in the Moin Wiki markup overview.
+in the MoinWiki markup overview.
 
 The example below is a very simple template for the **users** namespace. Each user
-is encouraged to create a home page using the 4-line Moin Wiki markup template.
+is encouraged to create a home page using the 4-line MoinWiki markup template.
 **@ITEM@** and **@EMAIL@** are predefined variables and will be replaced with
 the item name (the new item name is expected to be the user's name) and the user's
 email address (copied from the current user's settings) when the item is saved.

src/moin/constants/contenttypes.py

@@ -173,7 +173,7 @@ def ext_link(href, link_text=None):
 
 CONTENTTYPES_HELP_DOCS = {
     # content type: tuple - content type, button text; link generated later based on user preferred language
-    "text/x.moin.wiki;charset=utf-8": (("moin", _("Click for help on Moin Wiki markup."))),
+    "text/x.moin.wiki;charset=utf-8": (("moin", _("Click for help on MoinWiki markup."))),
     "text/x.moin.wiki;format=1.9;charset=utf-8": (("moin", _("Moinmoin 1.9 format is deprecated, convert to moin 2."))),
     "text/x-mediawiki;charset=utf-8": (("mediawiki", _("Click for help on Media Wiki markup."))),
     "text/x.moin.creole;charset=utf-8": (("creole", _("Click for help on Creole Wiki markup."))),

src/moin/help/help-en/Home.data

@@ -28,7 +28,7 @@ Because of the way the Markdown parser is constructed, it is frequently not poss
 
  * [[help-en/moin]]
 
- * [[../moin|Moin Wiki markup item]]
+ * [[../moin|MoinWiki markup item]]
  * [[../creole|Creole Wiki markup item]]
  * [[../rst|ReST markup item]]
  * [[../markdown|Markdown markup item]]

src/moin/help/help-en/MoinWikiMacros.data

@@ -1,4 +1,4 @@
-= Moin Wiki Macros =
+= MoinWiki Macros =
 
 With the exception of the markup supported within FootNotes, the MoinWiki and CreoleWiki parsers have identical macro syntax and features. The contents of this MoinWiki page will yield similar results when copied to a CreoleWiki page.
 

src/moin/help/help-en/moin.data

@@ -1,4 +1,4 @@
-= Moin Wiki Syntax =
+= MoinWiki Syntax =
 
 == Table Of Contents ==