# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1460922108 -7200
# Node ID e0b8b8a50013a04ba0f6f4df6ce244b3b12b92d6
# Parent  88fec2b2bd583b77ef540d012ac202cef8035daa# Parent  4b58e35a72e0c4bdd576e8b72a4ff230d317c7b5
Merge with Link Mauve

diff -r 4b58e35a72e0 -r e0b8b8a50013 mod_http_logging/mod_http_logging.lua
--- a/mod_http_logging/mod_http_logging.lua	Sat Apr 16 12:48:00 2016 +0100
+++ b/mod_http_logging/mod_http_logging.lua	Sun Apr 17 21:41:48 2016 +0200
@@ -25,7 +25,7 @@
 		local date = os.date("%d/%m/%Y:%H:%M:%S %z");
 		module:log("info", "%s - - [%s] \"%s\" %d %s", ip, date, req, response.status_code, tostring(len));
 	end
-	return server.send_response(response, body);
+	return send_response(response, body);
 end
 
 if module.wrap_object_event then
diff -r 4b58e35a72e0 -r e0b8b8a50013 mod_s2s_keepalive/README.markdown
--- a/mod_s2s_keepalive/README.markdown	Sat Apr 16 12:48:00 2016 +0100
+++ b/mod_s2s_keepalive/README.markdown	Sun Apr 17 21:41:48 2016 +0200
@@ -5,7 +5,7 @@
 Introduction
 ============
 
-This module periodically sends XEP-0199 ping requests to remote servers
+This module periodically sends [XEP-0199] ping requests to remote servers
 to keep your connection alive.
 
 Configuration
@@ -15,13 +15,15 @@
 desired servers in `keepalive_servers`. Optionally you can configure
 the ping interval.
 
-    modules_enabled = {
-        ...
-        "s2s_keepalive"
-    }
+``` lua
+modules_enabled = {
+    ...
+    "s2s_keepalive"
+}
 
-    keepalive_servers = { "conference.prosody.im"; "rooms.swift.im" }
-    keepalive_interval = "300" -- (in seconds, default is 60 )
+keepalive_servers = { "conference.prosody.im"; "rooms.swift.im" }
+keepalive_interval = "300" -- (in seconds, default is 60 )
+```
 
 Compatibility
 =============