Merge pull request #3208 from ntrel/mixin-ambig

Disambiguate 'Mixins' everywhere

Signed-off-by: Dennis <dkorpel@users.noreply.github.com>
Signed-off-by: Nicholas Wilson <thewilsonator@users.noreply.github.com>
Merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Author: dlang-bot

articles/index.dd

@@ -104,7 +104,7 @@ $(D_S Articles,
                     in D.)
             )
             $(DIVC item,
-                $(H4 $(LINK2 $(ROOT_DIR)articles/mixin.html, Mixins))
+                $(H4 $(LINK2 $(ROOT_DIR)articles/mixin.html, String Mixins))
                 $(P A short article about D's $(D mixin) statement which allows
                     to insert arbitrary code from a string, and how it compares
                     to the C preprocessor.)

articles/mixin.dd

@@ -1,8 +1,8 @@
 Ddoc
 
-$(D_S Mixins,
+$(D_S String Mixins,
 
-        $(P Mixins (not to be confused with
+        $(P String Mixins (not to be confused with
         $(DDLINK spec/template-mixin, Template Mixins, template mixins))
         enable string constants to be compiled as regular D code
         and inserted into the program.
@@ -91,5 +91,5 @@ END
 )
 
 Macros:
-        TITLE=Mixins
+        TITLE=String Mixins
         SUBNAV=$(SUBNAV_ARTICLES)

articles/template-comparison.dd

@@ -700,7 +700,7 @@ void foo(int t) { }
         $(TR
             $(TD Templates can be evaluated in scope
             of instantiation rather than definition)
-            $(TD Yes, $(LINK2 mixin.html, Mixins))
+            $(TD Yes, $(DDLINK spec/template-mixin, Template Mixins, Template Mixins))
             $(TD No, but can be faked using macros)
         )
 

comparison.dd

@@ -64,7 +64,7 @@ $(ITEMIZE
                 Template Template Parameters,
                 $(A articles/variadic-function-templates.html, Variadic Template Parameters),
                 $(A concepts.html, Template Constraints),
-                $(A spec/template-mixin.html, Mixins),
+                $(A spec/template-mixin.html, Template Mixins),
                 $(A spec/version.html#staticif, static if),
                 $(A spec/expression.html#IsExpression, expressions),
                 $(A spec/type.html#Typeof, typeof),

dlang.org.ddoc

@@ -477,7 +477,7 @@ $(SUBNAV_TEMPLATE
         $(ROOT_DIR)articles/intro-to-datetime.html, Introduction to std.datetime,
         $(ROOT_DIR)articles/lazy-evaluation.html, Lazy Evaluation,
         $(ROOT_DIR)articles/migrate-to-shared.html, Migrating to Shared,
-        $(ROOT_DIR)articles/mixin.html, Mixins,
+        $(ROOT_DIR)articles/mixin.html, String Mixins,
         $(ROOT_DIR)articles/regular-expression.html, Regular Expressions,
         $(ROOT_DIR)articles/safed.html, SafeD,
         $(ROOT_DIR)articles/templates-revisited.html, Templates Revisited,