Notification settings: move jabber setup section to bottom group of toggles (#103264)

* move jabber setup section to bottom group of toggles

* copy edit and link for inline support

Author: CGastrell

client/components/inline-support-link/context-links.js

@@ -187,6 +187,10 @@ const contextLinks = {
 		link: 'https://wordpress.com/support/invite-people/',
 		post_id: 1221,
 	},
+	'jabber-subscription-updates': {
+		link: 'https://wordpress.com/support/jabber',
+		post_id: 3228,
+	},
 	'manage-profile': {
 		link: 'https://wordpress.com/support/manage-my-profile/',
 		post_id: 19775,

client/me/notification-settings/reader-subscriptions/index.jsx

@@ -11,6 +11,7 @@ import FormLegend from 'calypso/components/forms/form-legend';
 import FormSectionHeading from 'calypso/components/forms/form-section-heading';
 import FormSelect from 'calypso/components/forms/form-select';
 import FormSettingExplanation from 'calypso/components/forms/form-setting-explanation';
+import InlineSupportLink from 'calypso/components/inline-support-link';
 import { withLocalizedMoment } from 'calypso/components/localized-moment';
 import Main from 'calypso/components/main';
 import NavigationHeader from 'calypso/components/navigation-header';
@@ -155,23 +156,6 @@ class NotificationSubscriptions extends Component {
 							</FormSelect>
 						</FormFieldset>
 
-						<FormFieldset>
-							<FormLegend>{ this.props.translate( 'Jabber subscription delivery' ) }</FormLegend>
-							<FormLabel>
-								<FormCheckbox
-									checked={ this.props.getSetting( 'subscription_delivery_jabber_default' ) }
-									disabled={ this.props.getDisabledState() }
-									id="subscription_delivery_jabber_default"
-									name="subscription_delivery_jabber_default"
-									onChange={ this.props.toggleSetting }
-									onClick={ this.handleCheckboxEvent( 'Notification delivery by Jabber' ) }
-								/>
-								<span>
-									{ this.props.translate( 'Default delivery via Jabber instant message' ) }
-								</span>
-							</FormLabel>
-						</FormFieldset>
-
 						<FormFieldset>
 							<FormLabel htmlFor="subscription_delivery_mail_option">
 								{ this.props.translate( 'Email delivery format' ) }
@@ -240,6 +224,27 @@ class NotificationSubscriptions extends Component {
 							</FormSettingExplanation>
 						</FormFieldset>
 
+						<FormFieldset>
+							<FormLegend>{ this.props.translate( 'Jabber subscription delivery' ) }</FormLegend>
+							<FormLabel>
+								<FormCheckbox
+									checked={ this.props.getSetting( 'subscription_delivery_jabber_default' ) }
+									disabled={ this.props.getDisabledState() }
+									id="subscription_delivery_jabber_default"
+									name="subscription_delivery_jabber_default"
+									onChange={ this.props.toggleSetting }
+									onClick={ this.handleCheckboxEvent( 'Notification delivery by Jabber' ) }
+								/>
+								<span>
+									{ this.props.translate( 'Receive subscription updates via instant message.' ) }{ ' ' }
+									<InlineSupportLink
+										supportContext="jabber-subscription-updates"
+										showIcon={ false }
+									/>
+								</span>
+							</FormLabel>
+						</FormFieldset>
+
 						<FormFieldset>
 							<FormLegend>{ this.props.translate( 'Pause emails' ) }</FormLegend>
 							<FormLabel>