=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SmsConfigurationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SmsConfigurationController.java	2011-12-15 20:41:45 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SmsConfigurationController.java	2011-12-16 21:52:08 +0000
@@ -1,5 +1,32 @@
 package org.hisp.dhis.api.controller;
 
+/*
+ * Copyright (c) 2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 import java.io.IOException;
 
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +47,6 @@
 @RequestMapping( value = SmsConfigurationController.RESOURCE_PATH )
 public class SmsConfigurationController
 {
-
     public static final String RESOURCE_PATH = "/config/sms";
 
     private static final Log log = LogFactory.getLog( SmsConfigurationController.class );
@@ -31,13 +57,13 @@
     @RequestMapping( method = RequestMethod.GET )
     public String getSmsConfiguration( Model model )
     {
-
         SmsConfiguration smsConfiguration = smsConfigurationManager.getSmsConfiguration();
 
-        if (smsConfiguration == null) {
+        if ( smsConfiguration == null )
+        {
             smsConfiguration = new SmsConfiguration();
         }
-        
+
         model.addAttribute( "model", smsConfiguration );
 
         return "smsConfiguration";

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl	2011-12-16 19:36:39 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl	2011-12-16 21:52:08 +0000
@@ -8,7 +8,7 @@
     <h3> <xsl:value-of select="local-name()" /> </h3>
 
     <h4>Starting a new conversation</h4>
-    <p>This is done through a POST to <code>/api/messageConversations using</code> the format below.</p>
+    <p>This is done through a POST to <code>/api/messageConversations</code> using the format below.</p>
 
   <pre style="font-size: 0.9em;">
   <![CDATA[

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java	2011-12-15 15:52:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java	2011-12-16 21:52:08 +0000
@@ -158,7 +158,7 @@
         response.setStatus( HttpServletResponse.SC_BAD_REQUEST );
         response.setContentType( CONTENT_TYPE_TEXT );
 
-        PrintWriter writer = new PrintWriter( response.getOutputStream() );
+        PrintWriter writer = response.getWriter();
         writer.println( message );
         writer.flush();
     }