#3417 renamed existing macrocontroller to macro rendering controller

src/Umbraco.Web/Editors/BackOfficeServerVariables.cs

@@ -169,7 +169,7 @@ namespace Umbraco.Web.Editors
                                 controller => controller.GetAllowedChildren(0))
                         },
                         {
-                            "macroApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<MacroController>(
+                            "macroApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<MacroRenderingController>(
                                 controller => controller.GetMacroParameters(0))
                         },
                         {

src/Umbraco.Web/Editors/MacroRenderingController.cs

@@ -27,11 +27,11 @@ namespace Umbraco.Web.Editors
     /// Session, we don't want it to throw null reference exceptions.
     /// </remarks>
     [PluginController("UmbracoApi")]
-    public class MacroController : UmbracoAuthorizedJsonController, IRequiresSessionState
+    public class MacroRenderingController : UmbracoAuthorizedJsonController, IRequiresSessionState
     {
         private readonly IVariationContextAccessor _variationContextAccessor;
 
-        public MacroController(IVariationContextAccessor variationContextAccessor)
+        public MacroRenderingController(IVariationContextAccessor variationContextAccessor)
         {
             _variationContextAccessor = variationContextAccessor;
         }

src/Umbraco.Web/Umbraco.Web.csproj

@@ -751,7 +751,7 @@
     <Compile Include="Mvc\EnsurePublishedContentRequestAttribute.cs" />
     <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="Editors\LogController.cs" />
-    <Compile Include="Editors\MacroController.cs" />
+    <Compile Include="Editors\MacroRenderingController.cs" />
     <Compile Include="Editors\MemberTypeController.cs" />
     <Compile Include="Editors\UpdateCheckController.cs" />
     <Compile Include="MembershipProviderExtensions.cs" />

src/Umbraco.Web/umbraco.presentation/page.cs

@@ -102,7 +102,7 @@ namespace umbraco
         /// Initializes a new instance of the page for a content.
         /// </summary>
         /// <param name="content">The content.</param>
-        /// <remarks>This is for <see cref="MacroController"/> usage only.</remarks>
+        /// <remarks>This is for <see cref="MacroRenderingController"/> usage only.</remarks>
         internal page(IContent content, IVariationContextAccessor variationContextAccessor)
             : this(new PagePublishedContent(content, variationContextAccessor))
         { }