sendgrid · mbernier · Jul 7, 2015 · Jul 7, 2015 · Jul 7, 2015 · Jul 7, 2015
diff --git a/source/API_Reference/Web_API_v3/subusers.apiblueprint b/source/API_Reference/Web_API_v3/subusers.apiblueprint
@@ -74,7 +74,7 @@ Subsers belonging to a parent user.
             "ips": ["1.1.1.1", "2.2.2.2"]
         }
 
-## Subusers Monitor [/v3/subusers/{subuser_name}/monitor]
+## Subusers Monitor [/subusers/{subuser_name}/monitor]
 
 + Parameters
 

diff --git a/source/Integrate/Partners/Tutorials/WindowsAzure.md b/source/Integrate/Partners/Tutorials/WindowsAzure.md
@@ -250,11 +250,7 @@ NSString *text = @"%20";
 NSString *subject = [itemText.text stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
 // Generate the Web API call
-<<<<<<< HEAD:source/Integrate/Partners/Tutorials/WindowsAzure.md
 NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://api.sendgrid.com/api/mail.send.json?to=%@&from=%@&fromname=%@&subject=%@&text=%@&api_user=%@&api_key=%@",to, from, fromname, subject, text, username, apikey]];
-=======
-NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://api.sendgrid.com/api/mail.send.json?to=%@&from=%@&fromname=%@&subject=%@&text=%@&api_user=%@&api_key=%@",to, from, fromname, subject, text, username, apikey]];
->>>>>>> f4202064a43620816d16671c073ad89d7e833dfa:source/Integrate/Partners/WindowsAzure.md
 
 // This writes the composed URL in the XCode console for debugging purposes
 NSLog(@"URL %@",url);

diff --git a/source/VidGrid/Event_Notification/configure.md b/source/VidGrid/Event_Notification/configure.md
diff --git a/source/VidGrid/Tools/index.html b/source/VidGrid/Tools/index.html
@@ -7,7 +7,7 @@
 ---
 <div itemscope itemtype="http://schema.org/VideoGallery">
 <meta itemprop="name" content="VidGrid">
-<p itemscope="description">Our Support Team is building handy tools and integrations to help you manage your account and send your messages effectively! 
+<p itemscope="description">Our Support Team is building handy tools and integrations to help you manage your account and send your messages effectively!
 <a href="mailto:[email protected]">What would you like see added to VidGrid?</a></p>
 
 <div class="row">
@@ -19,12 +19,4 @@
       Update your recipient list by removing the Email Reports (Unsubscribes, Bounces, Invalid Emails, Spam Reports) that are tracked within your SendGrid account.
     </li>
   </ul>
-  <ul>
-    <li>
-      <a href="{{ root_url }}/VidGrid/Tools/sendwithus.html">
-        Sendwithus
-      </a>
-      Learn how to setup an integration between your SendGrid and Sendwithus accounts.
-    </li>
-  </ul>
 </div>
diff --git a/source/VidGrid/email_activity.html b/source/VidGrid/email_activity.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Redirecting...</title>
+    <link rel="canonical" href="https://sendgrid.com/docs/User_Guide/email_activity.html"/>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta http-equiv="refresh" content="0; url=https://sendgrid.com/docs/User_Guide/email_activity.html" />
+</head>
+<body>
+<p><strong>Redirecting...</strong></p>
+<p><a href='https://sendgrid.com/docs/User_Guide/email_activity.html'>Click here if you are not redirected.</a></p>
+<script>
+    document.location.href = "https://sendgrid.com/docs/User_Guide/email_activity.html";
+</script>
+</body>
+</html>
diff --git a/source/_redirects.htaccess b/source/_redirects.htaccess
@@ -228,14 +228,11 @@ Redirect 301 /User_Guide/Setting_Up_Your_Server/Segmenting_Your_Traffic/subusers
 Redirect 301 /User_Guide/Setting_Up_Your_Server/smtp_ports.html https://sendgrid.com/docs/Classroom/Basics/smtp_ports.html
 Redirect 301 /User_Guide/Setting_Up_Your_Server/warming_up_ips.html https://sendgrid.com/docs/Classroom/Deliver/warming_up_ips.html
 Redirect 301 /User_Guide/Setting_Up_Your_Server/warming_up.html https://sendgrid.com/docs/Classroom/Deliver/warming_up_ips.html
-<<<<<<< HEAD
 Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/dns_setup.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
 Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/index.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
 Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.html https://sendgrid.com/docs/Glossary/spf.html
 Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/whitelabel_wizard.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
-=======
->>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05
-#this app goes away as of May 27, 2015
+#this app went away as of May 27, 2015
 Redirect 301 /User_Guide/Settings/gravatar.html https://sendgrid.com/docs/User_Guide/Settings/index.html
 Redirect 301 /User_Guide/smtp_ports.html https://sendgrid.com/docs/User_Guide/Setting_Up_Your_Server/smtp_ports.html
 Redirect 301 /User_Guide/template_engine_setup.html https://sendgrid.com/docs/User_Guide/Transactional_Email/Template_Engine/setup_guide.html
@@ -252,10 +249,8 @@ Redirect 301 /User_Guide/whitelabel_wizard.html https://sendgrid.com/docs/User_G
 #######
 Redirect 301 /VidGrid/activity.html https://sendgrid.com/docs/User_Guide/email_activity.html
 Redirect 301 /VidGrid/advanced_suppression_manager.html https://sendgrid.com/docs/User_Guide/Suppressions/advanced_suppression_manager.html
-<<<<<<< HEAD
-Redirect 301 /VidGrid/Email_Activity/activity.html https://sendgrid.com/docs/User_Guide/email_activity.html
-=======
 Redirect 301 /VidGrid/Email_Activity/activity.html https://sendgrid.com/docs/VidGrid/email_activity.html
+Redirect 301 /VidGrid/Event_Notification/configure.html https://sendgrid.com/docs/API_Reference/Webhooks/event.html
 Redirect 301 /VidGrid/Marketing_Emails/Analytics/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/analytics.html
 Redirect 301 /VidGrid/Marketing_Emails/Analytics/marketing_statistics.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/analytics.html
 Redirect 301 /VidGrid/Marketing_Emails/Analytics/unsubscribe_management.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/unsubscribes.html
@@ -265,7 +260,6 @@ Redirect 301 /VidGrid/Marketing_Emails/Design/newsletter_basics.html https://sen
 Redirect 301 /VidGrid/Marketing_Emails/Design/subscription_widget.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
 Redirect 301 /VidGrid/Marketing_Emails/Design/weblink.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/tags.html
 Redirect 301 /VidGrid/Marketing_Emails/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/index.html
->>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05
 Redirect 301 /VidGrid/Marketing_Emails/marketing_emails_setup.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/create_manage.html
 Redirect 301 /VidGrid/Marketing_Emails/Recipients/exporting.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
 Redirect 301 /VidGrid/Marketing_Emails/Recipients/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
@@ -275,10 +269,5 @@ Redirect 301 /VidGrid/Marketing_Emails/Review_and_Schedule/split_testing.html ht
 Redirect 301 /VidGrid/Marketing_Emails/Setup/overview.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/create_manage.html
 Redirect 301 /VidGrid/template_engine.html https://sendgrid.com/docs/User_Guide/Templates/index.html
 Redirect 301 /VidGrid/Template_Engine/template_engine.html https://sendgrid.com/docs/User_Guide/Templates/index.html
-<<<<<<< HEAD
 Redirect 301 /VidGrid/Whitelabel/whitelabel.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
 Redirect 301 /VidGrid/whitelabel.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
-=======
-Redirect 301 /VidGrid/Tools/sendwithus.html https://sendgrid.com/docs/User_Guide/Settings/index.html
-Redirect 301 /VidGrid/Whitelabel/whitelabel.html https://sendgrid.com/docs/VidGrid/whitelabel.html
->>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05