utopia 2.32.0 → 3.0.0

data/lib/utopia/static/middleware.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2025, by Samuel Williams.
+# Copyright, 2025-2026, by Samuel Williams.
 
 require_relative "../middleware"
-require_relative "../localization"
+require_relative "../request"
+require_relative "../response"
 
 require_relative "local_file"
 require_relative "mime_types"
+require_relative "../localization/resolver"
 
 require "traces/provider"
 
@@ -16,19 +18,24 @@ module Utopia
 		DEFAULT_CACHE_CONTROL = "public, max-age=3600".freeze
 		
 		# A middleware which serves static files from the specified root directory.
-		class Middleware
+		class Middleware < Protocol::HTTP::Middleware
+			include Localization::Resolver
+			
 			# @param root [String] The root directory to serve files from.
-			# @param types [Array] The mime-types (and file extensions) to recognize/serve.
+			# @param types [Array] The file extensions and named groups to recognize/serve.
 			# @param cache_control [String] The cache-control header to set for static content.
 			def initialize(app, root: Utopia::default_root, types: MIME_TYPES[:default], cache_control: DEFAULT_CACHE_CONTROL)
-				@app = app
-				@root = root
+				super(app)
+				
+				@root = File.expand_path(root)
 				
 				@extensions = MimeTypeLoader.extensions_for(types)
 				
 				@cache_control = cache_control
 			end
 			
+			# Freeze this object and its internal state.
+			# @returns [self] This object.
 			def freeze
 				return self if frozen?
 				
@@ -39,12 +46,12 @@ module Utopia
 				super
 			end
 			
-			def fetch_file(path)
-				# We need file_path to be an absolute path for X-Sendfile to work correctly.
-				file_path = File.join(@root, path.components)
-				
-				if File.exist?(file_path)
-					return LocalFile.new(@root, path)
+			# Open metadata for an existing file under the static root.
+			# @parameter local_path [String] The resolved filesystem path.
+			# @returns [LocalFile | Nil] The local file, or `nil` when it does not exist.
+			private def fetch_file(local_path)
+				if File.file?(local_path)
+					return LocalFile.new(local_path)
 				else
 					return nil
 				end
@@ -52,12 +59,16 @@ module Utopia
 			
 			attr :extensions
 			
-			LAST_MODIFIED = "Last-Modified".freeze
+			LAST_MODIFIED = "last-modified".freeze
 			CONTENT_TYPE = HTTP::CONTENT_TYPE
 			CACHE_CONTROL = HTTP::CACHE_CONTROL
-			ETAG = "ETag".freeze
-			ACCEPT_RANGES = "Accept-Ranges".freeze
+			ETAG = "etag".freeze
+			ACCEPT_RANGES = "accept-ranges".freeze
 			
+			# Build response headers for the given file.
+			# @parameter file [LocalFile] The file.
+			# @parameter content_type [String] The content type.
+			# @returns [Hash(String, String)] The response headers.
 			def response_headers_for(file, content_type)
 				if @cache_control.respond_to?(:call)
 					cache_control = @cache_control.call(file)
@@ -74,46 +85,67 @@ module Utopia
 				}
 			end
 			
-			def respond(env, path_info, extension)
-				path = Path[path_info].simplify
+			# Respond.
+			# @parameter request [Utopia::Request] The request.
+			# @parameter path [Protocol::URL::Path] The request path to serve.
+			# @parameter extension [String] The file extension.
+			# @parameter content_type [String] The file media type.
+			# @parameter localization [Utopia::Localization::Preferences | Nil] The selected localization.
+			# @returns [Protocol::HTTP::Response] The response.
+			def respond(request, path, extension, content_type, localization: request.localization)
+				local_path = path.local_path(@root)
 				
-				if locale = env[Localization::CURRENT_LOCALE_KEY]
-					path.last.insert(path.last.rindex(".") || -1, ".#{locale}")
+				if locale = localization&.locale
+					local_path = local_path.delete_suffix(extension) + ".#{locale}#{extension}"
 				end
 				
-				if file = fetch_file(path)
-					response_headers = self.response_headers_for(file, @extensions[extension])
+				if file = fetch_file(local_path)
+					response_headers = self.response_headers_for(file, content_type)
 					
-					if file.modified?(env)
-						return file.serve(env, response_headers)
+					if file.modified?(request)
+						return file.serve(request, response_headers)
 					else
-						return [304, response_headers, []]
+						return Response[304, response_headers, []]
 					end
 				end
 			end
 			
-			def call(env)
-				path_info = env[Rack::PATH_INFO]
-				extension = File.extname(path_info)
+			# Serve a recognized static file or pass the request to the next middleware.
+			# @parameter request [Utopia::Request] The request.
+			# @returns [Protocol::HTTP::Response] The static-file or downstream response.
+			def call(request)
+				case request.method
+				when Protocol::HTTP::Methods::GET, Protocol::HTTP::Methods::HEAD
+				else
+					return @delegate.call(request)
+				end
+				
+				path = request.url.path
+				extension = File.extname(path.basename)
 				
-				if @extensions.key?(extension.downcase)
-					if response = self.respond(env, path_info, extension)
+				if content_type = @extensions[extension.downcase]
+					response = resolve_localized(request) do |localization|
+						self.respond(request, path, extension, content_type, localization: localization)
+					end
+					
+					if response
 						return response
 					end
 				end
 				
 				# else if no file was found:
-				return @app.call(env)
+				return @delegate.call(request)
 			end
 		end
 		
 		Traces::Provider(Static) do
-			def respond(env, path_info, extension)
+			def respond(request, path, extension, content_type, localization: request.localization)
 				attributes = {
-					path_info: path_info,
+					path: path,
+					locale: localization&.locale,
 				}
 				
-				Traces.trace("utopia.static.respond", attributes: attributes) {super}
+				Traces.trace("utopia.static.respond", attributes: attributes){super}
 			end
 		end
 	end

data/lib/utopia/static/mime_types.rb

@@ -1,38 +1,29 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2025, by Samuel Williams.
+# Copyright, 2017-2026, by Samuel Williams.
 
-require "mime/types"
+require "protocol/media/registry"
 
 module Utopia
 	# A middleware which serves static files from the specified root directory.
 	module Static
 		# Default mime-types which are common for files served over HTTP:
 		MIME_TYPES = {
-			:xiph => {
-				"ogx" => "application/ogg",
-				"ogv" => "video/ogg",
-				"oga" => "audio/ogg",
-				"ogg" => "audio/ogg",
-				"spx" => "audio/ogg",
-				"flac" => "audio/flac",
-				"anx" => "application/annodex",
-				"axa" => "audio/annodex",
-				"xspf" => "application/xspf+xml",
-			},
+			:xiph => [
+				"ogx", "ogv", "oga", "ogg", "spx", "flac", "xspf"
+			],
 			:media => [
-				:xiph, "mp3", "mp4", "wav", "aiff", "aac", "webm", "mov", "avi", "wmv", "mpg", "m3u8", "ts"
+				:xiph, "mp3", "mp4", "wav", "aiff", "aac", "webm", "weba", "mov", "avi", "wmv", "mpg", "m3u8", "ts"
 			],
 			:text => [
-				"html", "css", "js", ["map", "application/json"], "txt", "rtf", "xml", "pdf"
+				"html", "css", "js", "map", "txt", "rtf", "xml", "pdf"
 			],
 			:fonts => [
-				"otf", ["eot", "application/vnd.ms-fontobject"], "ttf", "woff", "woff2"
+				"otf", "eot", "ttf", "woff", "woff2"
 			],
 			:archive => [
-				"zip", "tar", "tgz", "tar.gz", "tar.bz2", ["dmg", "application/x-apple-diskimage"],
-				["torrent", "application/x-bittorrent"]
+				"zip", "tar", "tgz", "gz", "bz2", "dmg", "torrent"
 			],
 			:images => [
 				"png", "gif", "jpeg", "tiff", "svg", "webp"
@@ -44,6 +35,8 @@ module Utopia
 		
 		# A class to assist with loading mime-type metadata.
 		class MimeTypeLoader
+			# Initialize an empty extension map backed by named MIME type groups.
+			# @parameter library [Object] The library.
 			def initialize(library)
 				@extensions = {}
 				@library = library
@@ -51,37 +44,53 @@ module Utopia
 			
 			attr :extensions
 			
+			# Find extensions associated with the given MIME types.
+			# @parameter types [Array] The MIME type definitions to expand.
+			# @parameter library [Hash] The named MIME type groups.
+			# @returns [Hash(String, String)] A mapping from file extensions to content types.
 			def self.extensions_for(types, library = MIME_TYPES)
 				loader = self.new(library)
 				loader.expand(types)
 				return loader.extensions
 			end
 			
-			def extract_extensions(mime_types)
-				mime_types.select{|mime_type| !mime_type.obsolete?}.each do |mime_type|
-					mime_type.extensions.each do |ext|
-						@extensions["." + ext] ||= mime_type.content_type
-					end
+			# Add an extension using its registered media type.
+			# @parameter extension [String] The file extension.
+			# @returns [Protocol::Media::Registry::Record] The registered media type record.
+			def add_extension(extension)
+				# Normalize optional leading dots and case before constructing the File.extname-style key:
+				extension = extension.delete_prefix(".").downcase
+				
+				if record = Protocol::Media::Registry.for_extension(extension)
+					@extensions["." + extension] = record.type.to_s
+					return record
 				end
+				
+				raise ExpansionError.new("Unknown file extension: #{extension.inspect}")
 			end
 			
+			# Raised when expansion processing fails.
 			class ExpansionError < ArgumentError
 			end
 			
+			# Expand named groups, file extensions, and explicit extension pairs into extension mappings.
+			# @parameter types [Array] The MIME type definitions.
+			# @returns [Array] The supplied definitions.
+			# @raises [ExpansionError] If a definition cannot be expanded.
 			def expand(types)
 				types.each do |type|
 					case type
 					when Symbol
-						self.expand(MIME_TYPES[type])
+						self.expand(@library.fetch(type))
 					when Array
 						@extensions["." + type[0]] = type[1]
 					when String
-						self.extract_extensions MIME::Types.of(type)
-					when Regexp
-						self.extract_extensions MIME::Types[type]
-					when MIME::Type
-						self.extract_extensions.call([type])
+						self.add_extension(type)
+					else
+						raise ExpansionError.new("Unsupported MIME type definition: #{type.inspect}")
 					end
+				rescue ExpansionError
+					raise
 				rescue
 					raise ExpansionError.new("#{self.class.name}: Error while processing #{type.inspect}!")
 				end

data/lib/utopia/static.rb

@@ -7,6 +7,8 @@ require_relative "static/middleware"
 
 module Utopia
 	module Static
+		# Construct static-file middleware.
+		# @returns [Static::Middleware] The static-file middleware.
 		def self.new(...)
 			Middleware.new(...)
 		end

data/lib/utopia/version.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2009-2025, by Samuel Williams.
+# Copyright, 2009-2026, by Samuel Williams.
 
+# @namespace
 module Utopia
-	VERSION = "2.32.0"
+	VERSION = "3.0.0"
 end

data/lib/utopia.rb

@@ -5,6 +5,7 @@
 
 require_relative "utopia/version"
 
+require_relative "utopia/application"
 require_relative "utopia/import_map"
 require_relative "utopia/content"
 require_relative "utopia/controller"
@@ -12,6 +13,5 @@ require_relative "utopia/exceptions"
 require_relative "utopia/redirection"
 require_relative "utopia/static"
 
-# Utopia is a web application framework built on top of Rack.
 module Utopia
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2009-2025, by Samuel Williams.  
+Copyright, 2009-2026, by Samuel Williams.  
 Copyright, 2015-2019, by Huba Nagy.  
 Copyright, 2020-2025, by Olle Jonsson.  
 Copyright, 2020, by Pierre Montelle.  

data/readme.md

@@ -8,7 +8,7 @@ Utopia is a website generation framework which provides a robust set of tools to
 
   - Designed for both content-based websites and applications. Does not depend on a database.
   - Supports flexible content localization based on industry recommendations.
-  - Rack middleware compatible with all major Ruby application servers. Small memory footprint by default.
+  - Built directly on `protocol-http` with a small application and middleware interface.
   - Low latency and high throughput. Capable of 10,000+ requests/second out of the box.
 
 ## Usage
@@ -17,7 +17,7 @@ Please see the [project documentation](https://socketry.github.io/utopia/) for m
 
   - [Getting Started](https://socketry.github.io/utopia/guides/getting-started/index) - This guide explains how to set up a `utopia` website for local development and deployment.
 
-  - [Middleware](https://socketry.github.io/utopia/guides/middleware/index) - This guide gives an overview of the different Rack middleware used by Utopia.
+  - [Middleware](https://socketry.github.io/utopia/guides/middleware/index) - This guide gives an overview of the different middleware used by Utopia.
 
   - [Server Setup](https://socketry.github.io/utopia/guides/server-setup/index) - This guide explains how to deploy a `utopia` web application.
 
@@ -31,6 +31,21 @@ Please see the [project documentation](https://socketry.github.io/utopia/) for m
 
 Please see the [project releases](https://socketry.github.io/utopia/releases/index) for all releases.
 
+### v3.0.0
+
+The 3.0.x series is considered a development release while the protocol HTTP application and controller interfaces stabilize.
+
+  - **Breaking** Require Ruby 3.3 or later.
+  - **Breaking** Replace the Rack-centric application boundary with <code class="language-ruby">Utopia::Application</code> and <code class="language-ruby">Protocol::HTTP::Middleware</code>. Applications now use `config/application.rb` and `config/serve.rb` instead of `config.ru`.
+  - **Breaking** Separate complete protocol responses from semantic controller results. Use `respond!` with a <code class="language-ruby">Protocol::HTTP::Response</code>, or `succeed!` with a value serialized by <code class="language-ruby">Utopia::Controller::Respond</code>.
+  - Parse request bodies at the controller layer using `protocol-content`, independently of URL query parameters.
+  - Resolve localization through immutable request preferences, avoiding repeated internal controller requests.
+  - Split redirection handling into focused middleware for rewrites, moved resources, directory indexes, and error documents.
+  - **Security** Fix handling of redirects that start with `//` to prevent open redirect vulnerabilities.
+  - Normalize request URLs using `Protocol::URL` and use structured paths throughout the middleware stack.
+  - Resolve static files through encoded URL paths, with improved `HEAD`, range, and validator handling.
+  - Use `protocol-media` and `protocol-http` for response and language negotiation, removing the `http-accept` dependency.
+
 ### v2.31.0
 
   - Add agent context.
@@ -53,10 +68,8 @@ Please see the [project releases](https://socketry.github.io/utopia/releases/ind
   - [Utopia::Gallery](https://github.com/ioquatix/utopia-gallery) — A fast photo gallery based on [libvips](https://github.com/jcupitt/libvips).
   - [Utopia::Project](https://github.com/socketry/utopia-project) — A Ruby project documentation tool.
   - [Utopia::Analytics](https://github.com/ioquatix/utopia-analytics) — Simple integration with Google Analytics.
-  - [HTTP::Accept](https://github.com/ioquatix/http-accept) — RFC compliant header parser.
   - [Samovar](https://github.com/ioquatix/samovar) — Command line parser used by Utopia.
   - [Mapping](https://github.com/ioquatix/mapping) — Provide structured conversions for web interfaces.
-  - [Rack::Test::Body](https://github.com/ioquatix/rack-test-body) — Provide convenient helpers for testing web interfaces.
 
 ### Examples
 
@@ -74,6 +87,22 @@ We welcome contributions to this project.
 4.  Push to the branch (`git push origin my-new-feature`).
 5.  Create new Pull Request.
 
+### Running Tests
+
+To run the test suite:
+
+``` shell
+bundle exec sus
+```
+
+### Making Releases
+
+To make a new release:
+
+``` shell
+bundle exec bake gem:release:patch # or minor or major
+```
+
 ### Developer Certificate of Origin
 
 In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.

data/releases.md

@@ -1,5 +1,20 @@
 # Releases
 
+## v3.0.0
+
+The 3.0.x series is considered a development release while the protocol HTTP application and controller interfaces stabilize.
+
+  - **Breaking** Require Ruby 3.3 or later.
+  - **Breaking** Replace the Rack-centric application boundary with {ruby Utopia::Application} and {ruby Protocol::HTTP::Middleware}. Applications now use `config/application.rb` and `config/serve.rb` instead of `config.ru`.
+  - **Breaking** Separate complete protocol responses from semantic controller results. Use `respond!` with a {ruby Protocol::HTTP::Response}, or `succeed!` with a value serialized by {ruby Utopia::Controller::Respond}.
+  - Parse request bodies at the controller layer using `protocol-content`, independently of URL query parameters.
+  - Resolve localization through immutable request preferences, avoiding repeated internal controller requests.
+  - Split redirection handling into focused middleware for rewrites, moved resources, directory indexes, and error documents.
+  - **Security** Fix handling of redirects that start with `//` to prevent open redirect vulnerabilities.
+  - Normalize request URLs using `Protocol::URL` and use structured paths throughout the middleware stack.
+  - Resolve static files through encoded URL paths, with improved `HEAD`, range, and validator handling.
+  - Use `protocol-media` and `protocol-http` for response and language negotiation, removing the `http-accept` dependency.
+
 ## v2.31.0
 
   - Add agent context.

data/setup/site/bake.rb

@@ -9,7 +9,7 @@ end
 
 # Restart the application server.
 def restart
-	call "falcon:supervisor:restart"
+	puts "Restart the Falcon service using your process manager."
 end
 
 # Start the development server.

data/setup/site/config/application.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative "environment"
+
+require "utopia/application"
+require "utopia/controller"
+require "utopia/content"
+require "utopia/exceptions"
+require "utopia/localization"
+require "utopia/redirection"
+require "utopia/session"
+require "utopia/static"
+
+Application = Utopia::Application.build do
+	if UTOPIA.production?
+		# Handle exceptions in production with an error page and send an email notification:
+		use Utopia::Exceptions::Handler
+		use Utopia::Exceptions::Mailer
+	end
+	
+	use Utopia::Localization,
+		default_locale: "en",
+		locales: ["en", "de", "ja", "zh"]
+	
+	# Serve static files from "public" directory:
+	use Utopia::Static, root: "public"
+	
+	use Utopia::Redirection::Rewrite, {
+		"/" => "/welcome/index"
+	}
+	
+	use Utopia::Redirection::DirectoryIndex
+	
+	# Handle error documents after client redirects so internal requests bypass them:
+	use Utopia::Redirection::Errors, {
+		404 => "/errors/file-not-found"
+	}
+	
+	use Utopia::Session,
+		expires_after: 3600 * 24,
+		secret: UTOPIA.secret_for(:session),
+		secure: true
+	
+	use Utopia::Controller
+	
+	# Serve static files from "pages" directory:
+	use Utopia::Static
+	
+	# Serve dynamic content:
+	use Utopia::Content
+end

data/setup/site/config/serve.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2026, by Samuel Williams.
+
+require "utopia/application"
+
+run Utopia::Application.load(File.expand_path("application.rb", __dir__))

data/setup/site/falcon.rb

@@ -2,11 +2,24 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2026, by Samuel Williams.
 
-load :rack, :lets_encrypt_tls, :supervisor
+require "async/service/supervisor"
+require "falcon/environment/application"
+require "falcon/environment/lets_encrypt_tls"
+require "utopia/application"
 
 hostname = File.basename(__dir__)
-rack hostname, :lets_encrypt_tls
 
-supervisor
+service hostname do
+	include Falcon::Environment::Application
+	include Falcon::Environment::LetsEncryptTLS
+	
+	def middleware
+		Utopia::Application.load
+	end
+end
+
+service "supervisor" do
+	include Async::Service::Supervisor::Environment
+end

data/setup/site/fixtures/website.rb

@@ -3,24 +3,41 @@
 # Released under the MIT License.
 # Copyright, 2016-2025, by Samuel Williams.
 
-require "rack/test"
+require "protocol/http/request"
 require "sus/fixtures/async/http"
-require "protocol/rack"
+require "utopia/application"
+require "uri"
 
 AWebsite = Sus::Shared("a website") do
-	include Rack::Test::Methods
+	let(:application_path) {File.expand_path("../config/application.rb", __dir__)}
+	let(:application_directory) {File.dirname(application_path)}
 	
-	let(:rackup_path) {File.expand_path("../config.ru", __dir__)}
-	let(:rackup_directory) {File.dirname(rackup_path)}
+	let(:app) {Utopia::Application.load(application_path)}
 	
-	let(:app) {Rack::Builder.parse_file(rackup_path)}
+	def get(path)
+		@last_request = Protocol::HTTP::Request["GET", path]
+		@last_response = app.call(@last_request)
+	end
+	
+	attr :last_request
+	attr :last_response
+	
+	def follow_redirect!
+		location = last_response.headers["location"]
+		raise "Cannot follow redirect without a location header!" unless location
+		
+		current = URI.join("http://localhost", last_request.path)
+		target = URI.join(current, location.to_s)
+		
+		get(target.request_uri)
+	end
 end
 
 AValidPage = Sus::Shared("a valid page") do |path|
 	it "can access #{path}" do
 		get path
 		
-		while last_response.redirect?
+		while last_response.redirection?
 			follow_redirect!
 		end
 		
@@ -31,9 +48,8 @@ end
 AServer = Sus::Shared("a server") do
 	include Sus::Fixtures::Async::HTTP::ServerContext
 	
-	let(:rackup_path) {File.expand_path("../config.ru", __dir__)}
-	let(:rackup_directory) {File.dirname(rackup_path)}
+	let(:application_path) {File.expand_path("../config/application.rb", __dir__)}
+	let(:application_directory) {File.dirname(application_path)}
 	
-	let(:rack_app) {Rack::Builder.parse_file(rackup_path)}
-	let(:app) {Protocol::Rack::Adapter.new(rack_app)}
+	let(:app) {Utopia::Application.load(application_path)}
 end

data/setup/site/gems.rb

@@ -17,8 +17,6 @@ gem "net-smtp"
 
 group :development do
 	gem "bake-test"
-	gem "rack-test"
-	gem "guard-falcon", require: false
 	
 	gem "sus"
 	gem "sus-fixtures-async-http"
@@ -29,5 +27,5 @@ group :development do
 end
 
 group :production do
-	gem "falcon"
+	gem "falcon", "~> 0.57"
 end

data/setup/site/lib/readme.txt

@@ -1 +1 @@
-You can add additional code for your application in this directory, and require it directly from the config.ru.
+You can add additional code for your application in this directory, and require it directly from config/application.rb.

data/setup/site/pages/welcome/index.xnode

@@ -11,13 +11,13 @@
 		<div>
 			<i class="fa fa-cubes"></i>
 			<h2>Modular code and structure</h2>
-			<p>Utopia provides independently useful <a href="https://github.com/rack/rack">Rack</a> middleware and has been designed with simplicity in mind. Several fully-featured webapps and a ton of commercial websites have guided the development of the Utopia stack. It is capable of handling a diverse range of requirements.</p>
+			<p>Utopia provides independently useful HTTP middleware and has been designed with simplicity in mind. Several fully-featured webapps and a ton of commercial websites have guided the development of the Utopia stack. It is capable of handling a diverse range of requirements.</p>
 		</div>
 		
 		<div>
 			<i class="fa fa-code"></i>
 			<h2>Well tested and maintained</h2>
-			<p>Utopia comprises a <a href="https://github.com/ioquatix/utopia">core gem</a> and several supporting libraries, the main ones being <a href="https://github.com/ioquatix/trenni">trenni</a> for templates and parsing, and <a href="https://github.com/ioquatix/http-accept">http-accept</a> for HTTP header processing. Together, these gems have over 90% test coverage.</p>
+			<p>Utopia comprises a <a href="https://github.com/ioquatix/utopia">core gem</a> and several supporting libraries, including <a href="https://github.com/socketry/xrb">XRB</a> for templates and markup parsing and <a href="https://github.com/socketry/protocol-http">Protocol HTTP</a> for HTTP protocol handling.</p>
 		</div>
 		
 		<div>
@@ -32,4 +32,4 @@
 			<p>Utopia supports the <code>Accept-Language</code> header and transparently selects the correct view to render. Build multi-lingual websites and webapps easily: translate content incrementally as required, or not at all.</p>
 		</div>
 	</section>
-</content:page>
+</content:page>

data/setup/site/readme.md

@@ -9,8 +9,5 @@ To start the development server, simply execute
 	> bake
 	Generating transient session key for development...
 	20:57:36 - INFO - Starting Falcon HTTP server on localhost:9292
-	20:57:36 - INFO - Guard::RSpec is running
-	20:57:36 - INFO - Guard is now watching at '...'
-	[1] guard(main)>
 
 Then browse https://localhost:9292 (or as specified) to see your new site.