Merge "Adding sample code to TemplateParser::processTemplate() docs"

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 41ae4a4..559ffb9 100644 (file)
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -166,6 +166,16 @@ class TemplateParser {
 
        /**
         * Returns HTML for a given template by calling the template function with the given args
+        *
+        * @code
+        *     echo $templateParser->processTemplate(
+        *         'ExampleTemplate',
+        *         array(
+        *             'username' => $user->getName(),
+        *             'message' => 'Hello!'
+        *         )
+        *     );
+        * @endcode
         * @param string $templateName The name of the template
         * @param mixed $args
         * @param array $scopes

diff --git a/includes/templates/NoLocalSettings.mustache b/includes/templates/NoLocalSettings.mustache
index 8a4616c..5457949 100644 (file)
--- a/includes/templates/NoLocalSettings.mustache
+++ b/includes/templates/NoLocalSettings.mustache
@@ -31,7 +31,7 @@
                                <p>Please <a href="{{path}}mw-config/index.{{ext}}">complete the installation</a> and download LocalSettings.php.</p>
                        {{/installerStarted}}
                        {{^installerStarted}}
-                               <p>Please <a href="{{path}}mw-config/index.{{ext}}">set up the wiki</a> first!</p>
+                               <p>Please <a href="{{path}}mw-config/index.{{ext}}">set up the wiki</a> first.</p>
                        {{/installerStarted}}
                {{/localSettingsExists}}
                </div>