Merge branch 'develop' of https://github.com/magento/devdocs_internal …

…into no-h1 # Conflicts: # css/app.css # guides/v2.2/mrg/ce/Sales/description.md # scss/app.scss
magento · Jul 25, 2017 · 4a5c7d7 · 4a5c7d7
2 parents 406e3a4 + 0b75457
commit 4a5c7d7
Show file tree

Hide file tree

Showing 332 changed files with 47,277 additions and 6,515 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ ignore
 /_config.sasha.yml
 /_config.tana.yml
 /_config.public.yml
+/_config.local.yml
 /*.yml
 !_config.devdocs.yml
 /gen_public.bat
@@ -36,4 +37,4 @@ Rakefile
 /vagrant/.vagrant/
 /vendor/
 /Gemfile.lock
-/node_modules/
+/node_modules/
diff --git a/_config.yml b/_config.yml
@@ -20,6 +20,9 @@ versions:
    -
       name: "2.1"
       url: guides/v2.1/
+   -
+      name: "2.2"
+      url: guides/v2.2/
 
 # GitHub variables
 github: "https://github.com/magento/devdocs/tree/develop/guides/"
@@ -84,9 +87,4 @@ incremental: false
 gems:
   - jekyll-redirect-from
 
-
-
-exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea', 'guides/v2.2']
-
-
-
+exclude: ['scss', 'bin', 'node_modules', 'vendor', '.git', '.idea']
diff --git a/_includes/cache/cache_overview.md b/_includes/cache/cache_overview.md
@@ -0,0 +1,27 @@
+<div markdown= "1">
+
+Caching is one of the most effective way of improving performance of web applications of all kinds. Generally speaking, there are two ways to cache: client-side (browser) and server-side. In addition, there are two types of content: public (available to multiple customers) and private (specific to one customer).
+
+Magento page caching is synonymous with *full-page caching*; in other words, we {% glossarytooltip 0bc9c8bc-de1a-4a06-9c99-a89a29c30645 %}cache{% endglossarytooltip %} the entire page. The Magento application gives you the following options:
+
+*	The default caching mechanism which stores cache files in any of the following:
+
+	*	On the file system. 
+
+		You don't need to do anything to use file-based caching.
+	*	[Database]({{ page.baseurl }}config-guide/cache/caching-database.html)
+	*	[Redis]({{ page.baseurl }}config-guide/redis/redis-pg-cache.html)
+*	[Varnish]({{ page.baseurl }}config-guide/varnish/config-varnish.html) (recommended)
+
+### Cacheable and uncacheable pages {#config-cache-over-cacheable}
+*Cacheable* and *uncacheable* are terms we use to indicate whether or not a page should be cached at all. (By default, all pages are cacheable.) If any block in a {% glossarytooltip 73ab5daa-5857-4039-97df-11269b626134 %}layout{% endglossarytooltip %} is designated as uncacheable, the entire page is uncacheable.
+
+To create an uncacheable page, mark any block on that page as uncacheable in the layout using `cacheable="false"`. 
+
+Examples of uncacheable pages include the compare products, cart, {% glossarytooltip 278c3ce0-cd4c-4ffc-a098-695d94d73bde %}checkout{% endglossarytooltip %} pages, and so on. 
+
+[Example]({{ site.mage2000url }}app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml){:target="_blank"}
+
+<div class="bs-callout bs-callout-warning">
+    <p>Do not configure content pages (that is, catalog, product and CMS pages) to be uncacheable. Doing so has an adverse affect on performance.</p>
+</div>