# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1536399458 -7200
# Node ID f69233c3e0c0fdbb4ce733502f10f6cdc8d94112
# Parent  2c62fda477a5135c470fd3bf41aeb1f5e232f732# Parent  65dd8ebbd82cb2213195037bb0afa23eeb90a5ea
merge

diff -r 2c62fda477a5 -r f69233c3e0c0 mod_profile/README.markdown
--- a/mod_profile/README.markdown	Sat Sep 08 11:31:26 2018 +0200
+++ b/mod_profile/README.markdown	Sat Sep 08 11:37:38 2018 +0200
@@ -19,8 +19,7 @@
 # Configuration
 
     modules_enabled = {
-        -- "pep";   -- These two modules must be removed
-        -- "vcard";
+        -- "vcard";  -- This module must be removed
 
         "profile";
     }
@@ -29,4 +28,5 @@
 
 Requires Prosody **trunk** as of 2014-05-29. Won't work in 0.10.x.
 
-It depends on the new [mod\_pep\_plus][doc:modules:mod_pep_plus] for PEP support.
+It depends on the trunk version of [mod\_pep][doc:modules:mod_pep] for PEP support, 
+previously known as [mod\_pep\_plus][doc:modules:mod_pep_plus].