From 06f2477cfd60632eb49b1a8b259489ec80995d1d Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 18 Nov 2014 16:32:37 +0000
Subject: [PATCH] the new iOS configuration profile also is used on OS X
 10.10.1, see #261

---
 CHANGELOG.md                         | 2 +-
 conf/ios-profile.xml                 | 4 ++--
 management/templates/mail-guide.html | 4 ++--
 setup/web.sh                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eef9cee8..9cec0923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Mail:
 
 * The maximum size of outbound mail sent via webmail and Exchange/ActiveSync has been increased to 128 MB, the same as when using SMTP.
 * Spam is no longer wrapped as an attachment inside a scary Spamassassin explanation. The original message is simply moved straight to the Spam folder unchanged.
-* There is a new iOS Configuration Profile link in the control panel which makes it easier to configure IMAP/SMTP/CalDAV/CardDAV on iOS devices.
+* There is a new iOS/Mac OS X Configuration Profile link in the control panel which makes it easier to configure IMAP/SMTP/CalDAV/CardDAV on iOS devices and Macs.
 * "Domain aliases" can now be configured in the control panel.
 * Updated to [Roundcube 1.0.3](http://trac.roundcube.net/wiki/Changelog).
 
diff --git a/conf/ios-profile.xml b/conf/ios-profile.xml
index 4fcec81e..983b260d 100644
--- a/conf/ios-profile.xml
+++ b/conf/ios-profile.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
- iOS Configuration Profile
+ iOS/OS X Configuration Profile
 
- Mobileconfig for iOS users to setup IMAP, Contacts & Calendars
+ Mobileconfig for iOS/OS X users to setup IMAP, SMTP, Contacts & Calendar
 
  https://developer.apple.com/library/ios/featuredarticles/iPhoneConfigurationProfileRef/Introduction/Introduction.html
 -->
diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html
index 05b123c8..c748349d 100644
--- a/management/templates/mail-guide.html
+++ b/management/templates/mail-guide.html
@@ -61,9 +61,9 @@
 				</div>
 
 				<div class="col-lg-6">
-					<h4>iOS Mobileconfig</h4>
+					<h4>iOS/Mac OS X Mobileconfig</h4>
 
-					<p>Open the following configuration on your iOS device.</p>
+					<p>Open the following configuration on your iOS device or on your Mac desktop to easily set up IMAP/SMTP, Contacts, and Calendar:</p>
 
 					<p><strong><a href="https://{{hostname}}/mailinabox.mobileconfig">https://{{hostname}}/mailinabox.mobileconfig</a></strong></p>
 
diff --git a/setup/web.sh b/setup/web.sh
index fd0b557c..ec1ef0ac 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -40,7 +40,7 @@ tools/editconf.py /etc/php5/fpm/pool.d/www.conf -c ';' \
 # since it depends on what domains we're serving, which we don't know
 # until mail accounts have been created.
 
-# Create the iOS Mobile Configuration file which is exposed via the
+# Create the iOS/OS X Mobile Configuration file which is exposed via the
 # nginx configuration at /mailinabox-mobileconfig.
 mkdir -p /var/lib/mailinabox
 chmod a+rx /var/lib/mailinabox