commit b3349ab11b9a6345f589fba244fcfbc11af69a5a
author Thomas Steiner <tomac@google.com> Wed Jan 08 16:21:57 2020 +0100
committer Otto van der Schaaf <oschaaf@we-amp.com> Wed Jan 08 16:21:57 2020 +0100
tree 9c68a7403962cf4fea435f5901cd6ac71610014e
parent 33e59495e3d86487eabf1e953351215a389cc67a

Typo fix: conjuction ==> conjunction (#1973)

* Fix typo

conjuction ==> conjunction

install/common/pagespeed.conf.template

diff --git a/install/common/pagespeed.conf.template b/install/common/pagespeed.conf.template
index 72aa53c..264cb48 100644
--- a/install/common/pagespeed.conf.template
+++ b/install/common/pagespeed.conf.template
@@ -42,7 +42,7 @@
     # ModPagespeedRewriteLevel PassThrough
 
     # Explicitly disables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, if one
+    # conjunction with ModPagespeedRewriteLevel. For instance, if one
     # of the filters in the CoreFilters needs to be disabled for a
     # site, that filter can be added to
     # ModPagespeedDisableFilters. This directive contains a
@@ -51,7 +51,7 @@
     # ModPagespeedDisableFilters rewrite_images
 
     # Explicitly enables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, filters
+    # conjunction with ModPagespeedRewriteLevel. For instance, filters
     # not included in the CoreFilters may be enabled using this
     # directive. This directive contains a comma-separated list of
     # filter names, and can be repeated.

install/demo.conf

diff --git a/install/demo.conf b/install/demo.conf
index a8c48cc..6001659 100644
--- a/install/demo.conf
+++ b/install/demo.conf
@@ -72,7 +72,7 @@
     # ModPagespeedRewriteLevel PassThrough
 
     # Explicitly disables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, if one
+    # conjunction with ModPagespeedRewriteLevel. For instance, if one
     # of the filters in the CoreFilters needs to be disabled for a
     # site, that filter can be added to
     # ModPagespeedDisableFilters. This directive contains a
@@ -81,7 +81,7 @@
     # ModPagespeedDisableFilters rewrite_images
 
     # Explicitly enables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, filters
+    # conjunction with ModPagespeedRewriteLevel. For instance, filters
     # not included in the CoreFilters may be enabled using this
     # directive. This directive contains a comma-separated list of
     # filter names, and can be repeated.

install/modpagespeed.com-configuration-example.conf

diff --git a/install/modpagespeed.com-configuration-example.conf b/install/modpagespeed.com-configuration-example.conf
index f7c7a62..a1f1da8 100644
--- a/install/modpagespeed.com-configuration-example.conf
+++ b/install/modpagespeed.com-configuration-example.conf
@@ -70,7 +70,7 @@
     # ModPagespeedRewriteLevel PassThrough
 
     # Explicitly disables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, if one
+    # conjunction with ModPagespeedRewriteLevel. For instance, if one
     # of the filters in the CoreFilters needs to be disabled for a
     # site, that filter can be added to
     # ModPagespeedDisableFilters. This directive contains a
@@ -79,7 +79,7 @@
     # ModPagespeedDisableFilters rewrite_images
 
     # Explicitly enables specific filters. This is useful in
-    # conjuction with ModPagespeedRewriteLevel. For instance, filters
+    # conjunction with ModPagespeedRewriteLevel. For instance, filters
     # not included in the CoreFilters may be enabled using this
     # directive. This directive contains a comma-separated list of
     # filter names, and can be repeated.