Merge

tkral · Feb 25, 2010 · 225448e · 225448e
2 parents 18e5a53 + 6ffb69a
commit 225448e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/documentation/manual/routes.textile b/documentation/manual/routes.textile
@@ -202,6 +202,11 @@ p(note). **Continuing the discussion**
 When the Router has determined which Java call to invoke for the received HTTP Request, the play framework then invokes that Java call. "Let's see how the Controller works":controllers.
 
 
+h2. <a name="content-types">Setting content types</a>
+
+You can specify the content type of the response in the routes file:
+
+bc. GET      /stylesheets/dynamic_css          css.SiteCSS(format:'css')
 
 
 
diff --git a/documentation/manual/templates.textile b/documentation/manual/templates.textile
@@ -192,6 +192,8 @@ bc. <ul>
 #{/list}
 </ul>
 
+You can find a list of available methods within the "API documentation":/@api/play/templates/JavaExtensions.html.
+
 h3. Create custom extensions
 
 Your project may have specific formatting needs, in which case you can provide your own extensions.
@@ -244,4 +246,4 @@ p(note). **Continuing the discussion**
 
 The last layer of a play application is the "domain object model":model.
 
-
+