From 39549313924e25e5f0ab388d066a87a16954917c Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 25 Feb 2015 12:23:31 +0100
Subject: [PATCH] Fix protocol name.

How did this ever work, at least for the last few years? Looks like no one is
actually still using POP3.

Conflicts:
	imp/docs/CHANGES
	imp/package.xml
---
 imp/config/backends.php | 2 +-
 imp/docs/CHANGES        | 1 +
 imp/package.xml         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/imp/config/backends.php b/imp/config/backends.php
index f0f87d4d413..0eda72a5d01 100644
--- a/imp/config/backends.php
+++ b/imp/config/backends.php
@@ -373,7 +373,7 @@
     'name' => 'POP3 Server',
     'hostspec' => 'localhost',
     'hordeauth' => false,
-    'protocol' => 'pop3',
+    'protocol' => 'pop',
     'port' => 110,
     // Default to secure TLS authentication by default (see RFC 2595 [4]).
     'secure' => 'tls',
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 0f3846de9d8..7fc71c35dba 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -61,6 +61,7 @@ v7.0.0-git
 v6.2.8
 ------
 
+[jan] Fix protocol name in POP3 example backend configuration.
 [mms] Don't honor linked attachment limit configuration options if linked
       attachments are disabled (Bug #13665).
 
diff --git a/imp/package.xml b/imp/package.xml
index e8dbe6cfd44..0715dd2be8e 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -3772,6 +3772,7 @@
    <date>2015-02-10</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Fix protocol name in POP3 example backend configuration.
 * [mms] Don&apos;t honor linked attachment limit configuration options if linked attachments are disabled (Bug #13665).
    </notes>
   </release>