Glossary: website

magento · Oct 7, 2018 · c8aaefe · c8aaefe
1 parent 70c7ba1
commit c8aaefe
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 27 deletions.
diff --git a/Rakefile b/Rakefile
@@ -36,7 +36,7 @@ task :install do
   puts "Installed!".green
 end
 
-desc "Build the entire web site"
+desc "Build the entire website"
 task build: %w[clean] do
   print 'Building the site with Jekyll: $ '.magenta
   jekyll 'build --verbose'

diff --git a/guides/m1x/ce18-ee113/EE113-benchmark.html b/guides/m1x/ce18-ee113/EE113-benchmark.html
@@ -146,7 +146,7 @@ <h3><!--TableOfContentsAnchor:Begin--><a name="Section_3.2"></a><!--TableOfConte
         <li>As many eCommerce sites offer different types of products, we specified physical (simple) products, virtual
             products, and downloadable products, with 60% of the products in each catalog being physical.
         </li>
-        <li>We benchmarked each catalog on one Web site/storefront.</li>
+        <li>We benchmarked each catalog on one website/storefront.</li>
     </ul>
 
     <figure>

diff --git a/guides/m1x/ce18-ee113/ee1.13_release-notes.html b/guides/m1x/ce18-ee113/ee1.13_release-notes.html
@@ -722,7 +722,7 @@ <h3 id="ce18-1800security">Security Enhancements</h3>
 (In the Admin Panel, <strong>System</strong> > <strong>Configuration</strong> > WEB > <strong>Session Validation Settings</strong>, <strong>Use SID on Frontend</strong>.)</li></ul>
 <div class="msg-box important"><img src="{{ site.baseurl }}/common/images/m1x/icon-note.png" alt="note" align="left" width="40"><span><strong>Note</strong>: The potential vulnerability exists <em>only</em> if both of the preceding are true. Default Magento installations or installations that enable <strong>Use SID on Frontend</strong> but have no custom code with full page caching are at no risk.</div>
 
-<p>If both of the preceding are true, Magento can be subjected to <a href="https://www.owasp.org/index.php/Cross-site_Scripting_(XSS)" target="_blank">cross-site scripting</a> (XSS) attacks&mdash;a type of injection issue, which means that malicious code is injected into otherwise trusted web sites, generally in the form of a browser-side script.</p>
+<p>If both of the preceding are true, Magento can be subjected to <a href="https://www.owasp.org/index.php/Cross-site_Scripting_(XSS)" target="_blank">cross-site scripting</a> (XSS) attacks&mdash;a type of injection issue, which means that malicious code is injected into otherwise trusted websites, generally in the form of a browser-side script.</p>
 <p><em>Issue</em>: Magento is subject to XSS attacks because the SID cookie value is not sanitized by default.</p>
 <p><em>Suggested solution</em>: Either disable <strong>Use SID on Frontend</strong> or <a href="http://stackoverflow.com/questions/4213686/best-practice-for-php-output" target="_blank">output-encode</a> any usage of the SID cookie value before using it or passing it as a parameter to any page cache helper functions.</p>
 <p>Additional references:</p>

diff --git a/guides/m1x/other/ht_extend_magento_rest_api.html b/guides/m1x/other/ht_extend_magento_rest_api.html
@@ -157,7 +157,7 @@ <h2 id="define-coupon-rule">Defining a Magento Coupon Code Generation Rule</h2>
 </tr>
 <tr>
   <td>Websites</td>
-  <td>Click the web sites on which you want the coupons to display. Hold down the Shift key and click the names of all items to select them.</td>
+  <td>Click the websites on which you want the coupons to display. Hold down the Shift key and click the names of all items to select them.</td>
 </tr>
 <tr>
   <td>Customer Groups</td>

diff --git a/guides/v2.0/architecture/archi_perspectives/components/AComponents.md b/guides/v2.0/architecture/archi_perspectives/components/AComponents.md
@@ -9,7 +9,7 @@ menu_node: parent
 
 ## Magento components
 
-Magento has several core components that are used to build custom web sites, applications, and integrated systems. When you change the appearance or behavior of your Magento store, you are inevitably changing one or more of these <b>core Magento components</b>, which include <b>modules</b>, <b>themes</b>, and <b>language packages</b>. Together, these core components determine much of server-side and {% glossarytooltip 1a70d3ac-6bd9-475a-8937-5f80ca785c14 %}storefront{% endglossarytooltip %} (frontend) appearance and behavior.
+Magento has several core components that are used to build custom websites, applications, and integrated systems. When you change the appearance or behavior of your Magento store, you are inevitably changing one or more of these <b>core Magento components</b>, which include <b>modules</b>, <b>themes</b>, and <b>language packages</b>. Together, these core components determine much of server-side and {% glossarytooltip 1a70d3ac-6bd9-475a-8937-5f80ca785c14 %}storefront{% endglossarytooltip %} (frontend) appearance and behavior.
 
 {: .bs-callout .bs-callout-info }
 Throughout the Magento documentation set, we also use the term *component* in its generic sense to mean element or part. However, the term **Magento component** explicitly refers to either a module, theme, or {% glossarytooltip 9c4c7b9b-43f0-4454-8e8c-fb62ad40c35f %}language package{% endglossarytooltip %}.

diff --git a/guides/v2.0/architecture/archi_perspectives/components/modules/mod_intro.md b/guides/v2.0/architecture/archi_perspectives/components/modules/mod_intro.md
@@ -42,7 +42,7 @@ Inside this folder, you will find all the code related to this module, including
 
 ## Working with modules
 
-Magento developers, administrators, and anyone building a Magento web site will want to review all relevant topics surrounding their particular goals and use cases.
+Magento developers, administrators, and anyone building a Magento website will want to review all relevant topics surrounding their particular goals and use cases.
 
 See [PHP Developer Guide]({{ page.baseurl }}/extension-dev-guide/bk-extension-dev-guide.html) for specific instructions on extending modules.
 

diff --git a/guides/v2.0/bk-get-started-magento.md b/guides/v2.0/bk-get-started-magento.md
@@ -8,7 +8,7 @@ Welcome to Magento 2.0 documentation! And welcome to Magento 2.0!
 
 Here we explain the Magento platform and components from the perspective of several audiences: merchants, web store developers (frontend developers), {% glossarytooltip 55774db9-bf9d-40f3-83db-b10cc5ae3b68 %}extension{% endglossarytooltip %} developers, system administrators, installers, and integrators.
 
-Magento is a highly-customizable eCommerce platform and content management system that is primarily used to build online storefronts or web sites for selling merchandise.
+Magento is a highly-customizable eCommerce platform and content management system that is primarily used to build online storefronts or websites for selling merchandise.
 
 Magento is written using the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} programming language, and leverages elements of the Zend framework and the model-view-controller architecture. Magento runs on the MySQL relational database, and Magento schema and tables are included in the Magento installation package.
 

diff --git a/guides/v2.0/cloud/live/live-prot.md b/guides/v2.0/cloud/live/live-prot.md
@@ -10,7 +10,7 @@ functional_areas:
   - Configuration
 ---
 
-Magento Commerce (Cloud) has a protective blocking feature that, under certain circumstances, restricts access to web sites with security vulnerabilities. We use this partial blocking method to prevent exploitation of known security vulnerabilities.
+Magento Commerce (Cloud) has a protective blocking feature that, under certain circumstances, restricts access to websites with security vulnerabilities. We use this partial blocking method to prevent exploitation of known security vulnerabilities.
 
 Outdated software often contains exploits we protect against by partially blocking access to these sites.
 
@@ -27,11 +27,11 @@ If a critical vulnerability is detected in your application, it rejects the Git
 
 We run two types of blocks:
 
-*	For development web sites, we run complete blocks.
+*	For development websites, we run complete blocks.
 
 	The error message accompanying `git push` provides detailed information about the vulnerability.
 
-*	For production web sites, we run a "partial block" that allows the site to stay mostly online.
+*	For production websites, we run a "partial block" that allows the site to stay mostly online.
 
 	Depending on the nature of the vulnerability, parts of a request, such as a query string, cookies or any additional headers, might be removed from GET requests. All other requests may be blocked entirely&mdash;this could apply to logging in, form submission, or product {% glossarytooltip 278c3ce0-cd4c-4ffc-a098-695d94d73bde %}checkout{% endglossarytooltip %}.
 

diff --git a/guides/v2.0/config-guide/redis/config-redis.md b/guides/v2.0/config-guide/redis/config-redis.md
@@ -17,7 +17,7 @@ functional_areas:
 
 ### Issues with `Zend_Cache_Backend_File`
 
-* The `core_cache_tag` table constantly grows. If a Magento instance has multiple web sites and web stores with large catalogs, the table can grow to 15 million records in less than a day. Insertion into `core_cache_tag` leads to issues with MySQL server, including performance degradation. 
+* The `core_cache_tag` table constantly grows. If a Magento instance has multiple websites and web stores with large catalogs, the table can grow to 15 million records in less than a day. Insertion into `core_cache_tag` leads to issues with MySQL server, including performance degradation. 
 
   (A *tag* is an identifier that classifies different types of Magento {% glossarytooltip 0bc9c8bc-de1a-4a06-9c99-a89a29c30645 %}cache{% endglossarytooltip %} objects.)
 

diff --git a/guides/v2.0/frontend-dev-guide/responsive-web-design/rwd_overview.md b/guides/v2.0/frontend-dev-guide/responsive-web-design/rwd_overview.md
@@ -9,7 +9,7 @@ functional_areas:
   - Frontend
 ---
 
-Responsive web design (RWD, also referred as <i>responsive design</i>) crafts web sites to provide an optimal viewing experience across a wide range of devices (from large, high-resolution desktop computer monitors to mobile phones).
+Responsive web design (RWD, also referred as <i>responsive design</i>) crafts websites to provide an optimal viewing experience across a wide range of devices (from large, high-resolution desktop computer monitors to mobile phones).
 
 The out of the box Magento Blank and Luma themes (Luma <a href="{{ page.baseurl }}/frontend-dev-guide/themes/theme-inherit.html" target="_blank">inherits</a> from Blank) use the mobile first RWD approach. It is ensured mostly by means of {% glossarytooltip 6c5cb4e9-9197-46f2-ba79-6147d9bfe66d %}CSS{% endglossarytooltip %} and {% glossarytooltip 312b4baf-15f7-4968-944e-c814d53de218 %}JavaScript{% endglossarytooltip %}.
 

diff --git a/guides/v2.0/install-gde/basics/basics_docroot.md b/guides/v2.0/install-gde/basics/basics_docroot.md
@@ -33,7 +33,7 @@ If you use one, contact your hosting provider to locate the web server docroot.
 This section assumes you've already set up a simple web server using [Apache virtual hosts](https://httpd.apache.org/docs/2.4/vhosts/){:target="_blank"} or [nginx server blocks](https://www.nginx.com/resources/wiki/start/topics/examples/server_blocks/){:target="_blank"}.
 
 {: .bs-callout .bs-callout-info }
-You can use _virtual hosts_ and _server blocks_ to run more than one web site on a single machine (e.g., `company1.example.com` and `company2.example.com`) or override the web server's default docroot without changing it.
+You can use _virtual hosts_ and _server blocks_ to run more than one website on a single machine (e.g., `company1.example.com` and `company2.example.com`) or override the web server's default docroot without changing it.
 
 To find the docroot on your server:
 

diff --git a/guides/v2.0/install-gde/prereq/apache.md b/guides/v2.0/install-gde/prereq/apache.md
@@ -185,7 +185,7 @@ If you encounter 403 Forbidden errors when trying to access the Magento site, yo
 
 #### Solving 403 Forbidden errors for Apache 2.4   {#install-apache-403_2.4}
 
-To enable web site visitors to access your site, use one of the <a href="http://httpd.apache.org/docs/2.4/howto/access.html" target="_blank">Require directives</a>.
+To enable website visitors to access your site, use one of the <a href="http://httpd.apache.org/docs/2.4/howto/access.html" target="_blank">Require directives</a>.
 
 For example:
 
@@ -201,7 +201,7 @@ The preceding values for `Order` might not work in all cases. For more informati
 
 #### Solving 403 Forbidden errors for Apache 2.2   {#install-apache-403_2.2}
 
-To enable web site visitors to access your site, use the <a href="http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow" target="_blank">Allow directive</a>.
+To enable website visitors to access your site, use the <a href="http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow" target="_blank">Allow directive</a>.
 
 For example:
 

diff --git a/guides/v2.1/architecture/archi_perspectives/components/AComponents.md b/guides/v2.1/architecture/archi_perspectives/components/AComponents.md
@@ -6,7 +6,7 @@ menu_title: Components
 
 ## Magento components
 
-Magento has several core components that are used to build custom web sites, applications, and integrated systems. When you change the appearance or behavior of your Magento store, you are inevitably changing one or more of these **core Magento components**, which include **modules**, **themes**, and **language packages**. Together, these core components determine much of server-side and {% glossarytooltip 1a70d3ac-6bd9-475a-8937-5f80ca785c14 %}storefront{% endglossarytooltip %} (frontend) appearance and behavior.
+Magento has several core components that are used to build custom websites, applications, and integrated systems. When you change the appearance or behavior of your Magento store, you are inevitably changing one or more of these **core Magento components**, which include **modules**, **themes**, and **language packages**. Together, these core components determine much of server-side and {% glossarytooltip 1a70d3ac-6bd9-475a-8937-5f80ca785c14 %}storefront{% endglossarytooltip %} (frontend) appearance and behavior.
 
 {:.bs-callout .bs-callout-tip}
 Throughout the Magento documentation set, we also use the term *component* in its generic sense to mean element or part. However, the term **Magento component** explicitly refers to either a module, theme, or {% glossarytooltip 9c4c7b9b-43f0-4454-8e8c-fb62ad40c35f %}language package{% endglossarytooltip %}.

diff --git a/guides/v2.1/architecture/archi_perspectives/components/modules/mod_intro.md b/guides/v2.1/architecture/archi_perspectives/components/modules/mod_intro.md
@@ -38,7 +38,7 @@ Inside this folder, you will find all the code related to this module, including
 
 ## Working with modules
 
-Magento developers, administrators, and anyone building a Magento web site will want to review all relevant topics surrounding their particular goals and use cases.
+Magento developers, administrators, and anyone building a Magento website will want to review all relevant topics surrounding their particular goals and use cases.
 
 See [PHP Developer Guide]({{page.baseurl}}/extension-dev-guide/bk-extension-dev-guide.html) for specific instructions on extending modules 
 

diff --git a/guides/v2.1/bk-get-started-magento.md b/guides/v2.1/bk-get-started-magento.md
@@ -14,7 +14,7 @@ Welcome to Magento 2.0 documentation! And welcome to Magento 2.0!
 
 Here we explain the Magento platform and components from the perspective of several audiences: merchants, web store developers (frontend developers), {% glossarytooltip 55774db9-bf9d-40f3-83db-b10cc5ae3b68 %}extension{% endglossarytooltip %} developers, system administrators, installers, and integrators.
 
-Magento is a highly-customizable eCommerce platform and content management system that is primarily used to build online storefronts or web sites for selling merchandise.
+Magento is a highly-customizable eCommerce platform and content management system that is primarily used to build online storefronts or websites for selling merchandise.
 
 Magento is written using the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} programming language, and leverages elements of the Zend framework and the model-view-controller architecture. Magento runs on the MySQL relational database, and Magento schema and tables are included in the Magento installation package.
 

diff --git a/guides/v2.1/cloud/live/live-prot.md b/guides/v2.1/cloud/live/live-prot.md
@@ -10,7 +10,7 @@ functional_areas:
   - Configuration
 ---
 
-Magento Commerce (Cloud) has a protective blocking feature that, under certain circumstances, restricts access to web sites with security vulnerabilities. We use this partial blocking method to prevent exploitation of known security vulnerabilities.
+Magento Commerce (Cloud) has a protective blocking feature that, under certain circumstances, restricts access to websites with security vulnerabilities. We use this partial blocking method to prevent exploitation of known security vulnerabilities.
 
 Outdated software often contains exploits we protect against by partially blocking access to these sites.
 
@@ -27,11 +27,11 @@ If a critical vulnerability is detected in your application, it rejects the Git
 
 We run two types of blocks:
 
-*	For development web sites, we run complete blocks.
+*	For development websites, we run complete blocks.
 
 	The error message accompanying `git push` provides detailed information about the vulnerability.
 
-*	For production web sites, we run a "partial block" that allows the site to stay mostly online.
+*	For production websites, we run a "partial block" that allows the site to stay mostly online.
 
 	Depending on the nature of the vulnerability, parts of a request, such as a query string, cookies or any additional headers, might be removed from GET requests. All other requests may be blocked entirely&mdash;this could apply to logging in, form submission, or product {% glossarytooltip 278c3ce0-cd4c-4ffc-a098-695d94d73bde %}checkout{% endglossarytooltip %}.
 

diff --git a/guides/v2.1/frontend-dev-guide/responsive-web-design/rwd_overview.md b/guides/v2.1/frontend-dev-guide/responsive-web-design/rwd_overview.md
@@ -5,7 +5,7 @@ functional_areas:
   - Frontend
 ---
 
-Responsive web design (RWD, also referred as *responsive design*) crafts web sites to provide an optimal viewing experience across a wide range of devices (from large, high-resolution desktop computer monitors to mobile phones).
+Responsive web design (RWD, also referred as *responsive design*) crafts websites to provide an optimal viewing experience across a wide range of devices (from large, high-resolution desktop computer monitors to mobile phones).
 
 The out of the box Magento Blank and Luma themes (Luma [inherits]({{ page.baseurl }}/frontend-dev-guide/themes/theme-inherit.html) from Blank) use the mobile first RWD approach. It is ensured mostly by means of CSS and JavaScript.
 

diff --git a/guides/v2.1/install-gde/basics/basics_docroot.md b/guides/v2.1/install-gde/basics/basics_docroot.md
@@ -33,7 +33,7 @@ If you use one, contact your hosting provider to locate the web server docroot.
 This section assumes you've already set up a simple web server using [Apache virtual hosts](https://httpd.apache.org/docs/2.4/vhosts/){:target="_blank"} or [nginx server blocks](https://www.nginx.com/resources/wiki/start/topics/examples/server_blocks/){:target="_blank"}.
 
 {:.bs-callout .bs-callout-info}
-You can use _virtual hosts_ and _server blocks_ to run more than one web site on a single machine (e.g., `company1.example.com` and `company2.example.com`) or override the web server's default docroot without changing it.
+You can use _virtual hosts_ and _server blocks_ to run more than one website on a single machine (e.g., `company1.example.com` and `company2.example.com`) or override the web server's default docroot without changing it.
 
 To find the docroot on your server:
 

diff --git a/guides/v2.1/install-gde/prereq/apache.md b/guides/v2.1/install-gde/prereq/apache.md
@@ -182,7 +182,7 @@ If you encounter 403 Forbidden errors when trying to access the Magento site, yo
 
 #### Solving 403 Forbidden errors for Apache 2.4 {#install-apache-403_2.4}
 
-To enable web site visitors to access your site, use one of the [Require directives](http://httpd.apache.org/docs/2.4/howto/access.html){:target="_blank"}.
+To enable website visitors to access your site, use one of the [Require directives](http://httpd.apache.org/docs/2.4/howto/access.html){:target="_blank"}.
 
 For example:
 
@@ -198,7 +198,7 @@ The preceding values for `Order` might not work in all cases. For more informati
 
 #### Solving 403 Forbidden errors for Apache 2.2 {#install-apache-403_2.2}
 
-To enable web site visitors to access your site, use the [Allow directive](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow){:target="_blank"}.
+To enable website visitors to access your site, use the [Allow directive](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow){:target="_blank"}.
 
 For example:
 

diff --git a/guides/v2.3/install-gde/prereq/apache.md b/guides/v2.3/install-gde/prereq/apache.md
@@ -182,7 +182,7 @@ If you encounter 403 Forbidden errors when trying to access the Magento site, yo
 
 #### Solving 403 Forbidden errors for Apache 2.4 {#install-apache-403_2.4}
 
-To enable web site visitors to access your site, use one of the [Require directives](http://httpd.apache.org/docs/2.4/howto/access.html){:target="_blank"}.
+To enable website visitors to access your site, use one of the [Require directives](http://httpd.apache.org/docs/2.4/howto/access.html){:target="_blank"}.
 
 For example:
 
@@ -198,7 +198,7 @@ The preceding values for `Order` might not work in all cases. For more informati
 
 #### Solving 403 Forbidden errors for Apache 2.2 {#install-apache-403_2.2}
 
-To enable web site visitors to access your site, use the [Allow directive](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow){:target="_blank"}.
+To enable website visitors to access your site, use the [Allow directive](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow){:target="_blank"}.
 
 For example: