diff --git a/.gitignore b/.gitignore index 6e56faa304..928ad598e3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /node_modules/ _algolia_api_key +_data/backup.yml diff --git a/Gemfile b/Gemfile index 1cb3ba0f00..46c0e1bf71 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' gem 'github-pages' gem 'jekyll-last-modified-at' gem 'devdocs', :git => 'https://github.com/magento-devdocs/devdocs-theme.git', :branch => 'devdocs-stable' +gem "webrick", "~> 1.8" gem 'wdm' if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index e2337cd348..41e3c20189 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/magento-devdocs/devdocs-theme.git - revision: f864973ba8a063a7ad3da4ecfe47fa978a230f17 + revision: edabd815ee3ead3efffe983be5cb6961c3543aae branch: devdocs-stable specs: devdocs (0.0.1) @@ -9,283 +9,332 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - algolia_html_extractor (2.6.1) + Ascii85 (1.1.0) + activesupport (7.1.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + afm (0.2.2) + algolia_html_extractor (2.6.4) json (~> 2.0) - nokogiri (~> 1.8.2) - algoliasearch (1.23.2) + nokogiri (~> 1.10) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) + async (2.8.0) + console (~> 1.10) + fiber-annotation + io-event (~> 1.1) + timers (~> 4.1) + base64 (0.2.0) + bigdecimal (3.1.5) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - colorize (0.8.1) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.0.5) - dnsruby (1.61.2) - addressable (~> 2.5) - em-websocket (0.5.1) + commonmarker (0.23.10) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + console (1.23.3) + fiber-annotation + fiber-local + dnsruby (1.70.0) + simpleidn (~> 0.2.1) + drb (2.2.0) + ruby2_keywords + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.11.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (0.15.3) - multipart-post (>= 1.2, < 3) - ffi (1.9.25) + execjs (2.9.1) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + ffi (1.16.3-x64-mingw-ucrt) + fiber-annotation (0.2.0) + fiber-local (1.0.0) filesize (0.2.0) forwardable-extended (2.6.0) - gemoji (3.0.0) - github-pages (192) - activesupport (= 4.2.10) - github-pages-health-check (= 1.8.1) - jekyll (= 3.7.4) - jekyll-avatar (= 0.6.0) + gemoji (3.0.1) + github-pages (228) + github-pages-health-check (= 1.17.9) + jekyll (= 3.9.3) + jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.5) + jekyll-commonmark-ghpages (= 0.4.0) jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.10.0) + jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.9.4) - jekyll-mentions (= 1.4.1) - jekyll-optional-front-matter (= 0.3.0) + jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.5.3) - jekyll-remote-theme (= 0.3.1) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.5.0) - jekyll-sitemap (= 1.2.0) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.3) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.1) - kramdown (= 1.17.0) - liquid (= 4.0.0) - listen (= 3.1.5) + jekyll-seo-tag (= 2.8.0) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.12.0) + kramdown (= 2.3.2) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.4) mercenary (~> 0.3) - minima (= 2.5.0) - nokogiri (>= 1.8.2, < 2.0) - rouge (= 2.2.1) + minima (= 2.5.1) + nokogiri (>= 1.13.6, < 2.0) + rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.8.1) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (~> 2.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.8.4) + hashery (2.1.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.9.2) - activesupport (>= 4.2, < 6.0) + html-proofer (5.0.8) addressable (~> 2.3) - colorize (~> 0.8) - mercenary (~> 0.3.2) - nokogiri (~> 1.8.1) - parallel (~> 1.3) + async (~> 2.1) + nokogiri (~> 1.13) + pdf-reader (~> 2.11) + rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) + zeitwerk (~> 2.5) + http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.7.4) + io-event (1.4.1) + jekyll (3.9.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-algolia (1.4.7) + jekyll-algolia (1.7.1) algolia_html_extractor (~> 2.6) - algoliasearch (~> 1.18) + algoliasearch (~> 1.26) filesize (~> 0.1) - jekyll (~> 3.0) + jekyll (>= 3.6, < 5.0) json (~> 2.0) nokogiri (~> 1.6) progressbar (~> 1.9) verbal_expressions (~> 0.1.5) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.2.0) - commonmarker (~> 0.14) - jekyll (>= 3.0, < 4.0) - jekyll-commonmark-ghpages (0.1.5) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1) - rouge (~> 2) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.10.0) - jekyll (~> 3.3) + jekyll-feed (0.15.1) + jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.9.4) - jekyll (~> 3.1) + jekyll-github-metadata (2.13.0) + jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) - jekyll-last-modified-at (1.0.1) - jekyll (~> 3.3) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-last-modified-at (1.3.0) + jekyll (>= 3.7, < 5.0) posix-spawn (~> 0.3.9) - jekyll-mentions (1.4.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.2.0) - jekyll (~> 3.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) - jekyll-relative-links (0.5.3) - jekyll (~> 3.3) - jekyll-remote-theme (0.3.1) - jekyll (~> 3.5) - rubyzip (>= 1.2.1, < 3.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.3) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) + jekyll-theme-hacker (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) + jekyll-theme-primer (0.6.0) + jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) - jekyll-watch (2.0.0) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.10.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) - jekyll (~> 3.0) - json (2.1.0) - kramdown (1.17.0) - launchy (2.4.3) - addressable (~> 2.3) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + jekyll (>= 3.0, < 5.0) + json (2.7.1) + kramdown (2.3.2) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + launchy (2.5.2) + addressable (~> 2.8) + liquid (4.0.4) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.3.0) - minima (2.5.0) - jekyll (~> 3.5) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.11.3) - multipart-post (2.0.0) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) - octokit (4.12.0) - sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.12.1) - pathutil (0.16.1) + minitest (5.21.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.0-x64-mingw-ucrt) + racc (~> 1.4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + pathutil (0.16.2) forwardable-extended (~> 2.6) - posix-spawn (0.3.13) - progressbar (1.10.0) - public_suffix (2.0.5) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (2.2.1) - ruby-enum (0.7.2) - i18n - ruby_dep (1.5.0) - rubyzip (1.2.2) - safe_yaml (1.0.4) - sass (3.6.0) + pdf-reader (2.12.0) + Ascii85 (~> 1.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk + posix-spawn (0.3.15) + progressbar (1.13.0) + public_suffix (4.0.7) + racc (1.7.3) + rainbow (3.1.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.6) + rouge (3.26.0) + ruby-rc4 (0.1.5) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + simpleidn (0.2.1) + unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - typhoeus (1.3.0) + timers (4.3.5) + ttfunk (1.7.0) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unicode-display_width (1.4.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.9.1-x64-mingw-ucrt) + unicode-display_width (1.8.0) + uri (0.13.0) verbal_expressions (0.1.5) - yell (2.0.7) + wdm (0.1.1) + webrick (1.8.1) + yell (2.2.2) + zeitwerk (2.6.12) PLATFORMS - ruby + x64-mingw-ucrt DEPENDENCIES devdocs! @@ -294,6 +343,8 @@ DEPENDENCIES jekyll-algolia (~> 1.0) jekyll-last-modified-at launchy + wdm + webrick (~> 1.8) BUNDLED WITH - 1.16.5 + 2.5.4 diff --git a/_config.checks.yml b/_config.checks.yml index a8e62a17ef..2d75873856 100644 --- a/_config.checks.yml +++ b/_config.checks.yml @@ -13,7 +13,7 @@ html-proofer: :parallel: :in_processes: 3 :file_ignore: - - !ruby/regexp /guides\/m1x/ + - !ruby/regexp /guides\/v19.x/ - !ruby/regexp /template\.html/ - !ruby/regexp /whats-new\.html/ :url_ignore: diff --git a/_config.stage.yml b/_config.stage.yml index 4c25d9eead..3e63d19284 100644 --- a/_config.stage.yml +++ b/_config.stage.yml @@ -1 +1 @@ -url: "https://devdocs.magedevteam.com" \ No newline at end of file +url: "https://devdocs.magedevteam.com" diff --git a/_config.yml b/_config.yml index 806c3b871c..727bd755bc 100644 --- a/_config.yml +++ b/_config.yml @@ -33,10 +33,14 @@ defaults: feedback_link: true - scope: - path: guides/m1x + path: guides/v19.x + values: + layout: null + - + scope: + path: guides/v1.8 values: layout: null - - scope: path: mftf/2.2 @@ -94,8 +98,8 @@ algolia: index_name: devdocs api_key: d2d0f33ab73e291ef8d88d8b565e754c files_to_exclude: - - guides/m1x/**/*.html - - guides/m1x/**/*.md + - guides/v19.x/**/*.html + - guides/v19.x/**/*.md - swagger - redoc @@ -111,8 +115,12 @@ check_links: true ############# # # 1.x variables -m1xgdeurl: /guides/m1x/ -m1xgithuburl: https://github.com/OpenMage/devdocs/blob/master/ + +v1xgdeurl: /guides/v19.x +v1xgithuburl: https://github.com/OpenMage/devdocs/tree/master +v18xgdeurl: /guides/v1.8/ + +gdeurl23: https://devdocs.magento.com/redoc/2.3/ ########## # Ignore # @@ -136,3 +144,4 @@ exclude: - rakelib - README.md - _plugins + diff --git a/_data/footer-links.yml b/_data/footer-links.yml index b00b0689fe..ccf34ea047 100644 --- a/_data/footer-links.yml +++ b/_data/footer-links.yml @@ -2,16 +2,7 @@ url: https://github.com/OpenMage/devdocs/blob/master/.github/CONTRIBUTING.md - label: Glossary - url: https://magento.github.io/glossary/index.html?audience=developer - -- label: Privacy Policy - url: https://magento.com/legal/terms/privacy/ - -- label: Terms of Service - url: https://magento.com/legal/terms/ - -- label: License/Trademark FAQ - url: https://magento.com/legal/licensing/ + url: https://glossary.magento.com/ - label: Release Notes url: /release-notes/bk-release-notes.html diff --git a/_data/main-nav.yml b/_data/main-nav.yml index 2612022b96..91e83f575b 100644 --- a/_data/main-nav.yml +++ b/_data/main-nav.yml @@ -1,55 +1,12 @@ -- label: Cloud - children: - - - label: Cloud Guide - url: /cloud/bk-cloud.html - - - label: Cloud Architecture - url: /cloud/architecture/cloud-architecture.html - - - label: Local Development - url: /cloud/setup/first-time-setup.html - - - label: Docker quick reference - url: /cloud/docker/docker-quick-reference.html - - - label: Configure Environments - url: /cloud/env/environments.html - - - label: Upgrades and Patches - url: /cloud/project/project-upgrade-parent.html - - - label: Release Notes - url: /cloud/release-notes/cloud-tools.html - exclude_versions: ['2.0'] - - label: Setup children: - label: Installation Guide - url: /install-gde/bk-install-guide.html - - - label: Extension Update and System Upgrade Guide - url: /comp-mgr/bk-compman-upgrade-guide.html - exclude_versions: ['2.0', '2.1'] - - - label: Component Manager and System Upgrade Guide - url: /comp-mgr/bk-compman-upgrade-guide.html - include_versions: ['2.0', '2.1'] - - - label: Configuration Guide - url: /config-guide/bk-config-guide.html - - - label: Performance Best Practices - url: /performance-best-practices/introduction.html - exclude_versions: ['2.0','2.1'] + url: /install-gde/install-flow-diagram.html - label: Migration Guide url: /migration/bk-migration-guide.html - - label: Magento Commerce (Cloud) Guide - url: /cloud/bk-cloud.html - - label: Release Information url: /release-notes/bk-release-notes.html @@ -60,107 +17,54 @@ children: - label: Architecture - url: /architecture/bk-architecture.html + url: / - label: PHP Developer Guide - url: /extension-dev-guide/bk-extension-dev-guide.html + url: / - label: Extension Developer Best Practices - url: /ext-best-practices/bk-ext-best-practices.html + url: / - label: Module Reference Guide - url: /mrg/intro.html + url: / - label: Coding Standards - url: /coding-standards/bk-coding-standards.html + url: / - - label: Contributor Guide - url: /contributor-guide/contributing.html + - label: Contribute! + url: https://github.com/OpenMage/magento-lts - label: Frontend children: - label: Frontend Developer Guide - url: /frontend-dev-guide/bk-frontend-dev-guide.html - - - label: UI Components - url: /ui-components/ui-component.html - include_versions: ['2.0'] - - - label: UI Components Guide - url: /ui_comp_guide/bk-ui_comps.html - exclude_versions: ['2.0'] - - - label: JavaScript Developer Guide - url: /javascript-dev-guide/bk-javascript-dev-guide.html - - - label: Admin Design Pattern Library - url: /pattern-library/bk-pattern.html - - - label: Admin Style Guide - url: /design-styleguide/bk-styleguide.html - - - label: Magento PWA Documentation Site - url: https://magento-research.github.io/pwa-studio/ - include_versions: ['2.3'] + url: / - label: API children: - label: Get Started with Magento Web APIs - url: /get-started/bk-get-started-api.html + url: / - label: REST API Reference - url: /rest/bk-rest.html + url: /api/rest-api-index.html - label: SOAP API Reference - url: /soap/bk-soap.html - - - label: GraphQL Developer Guide - url: /graphql/ - include_versions: ['2.3'] - - - label: Marketplace EQP API Reference - url: /marketplace/eqp/api.html - exclude_versions: ['2.0'] - - - label: Magento BI Import REST API - url: https://developers.rjmetrics.com/ - exclude_versions: ['2.0'] + url: /api/soap-api-index.html - label: Testing children: - - label: Magento Testing Guide - url: /test/testing.html - - label: Functional Acceptance Testing (MFTF) url: /mftf/2.3/introduction.html exclude_versions: ['2.0', '2.1'] versionless: true - - label: Functional Testing - url: /mtf/mtf_introduction.html - - - label: Integration Testing - url: /test/integration/integration_test_execution.html - - - label: JavaScript Unit Testing - url: /test/js/jasmine.html - - - label: PHP Unit Testing - url: /test/unit/unit_test_execution.html - - - label: Web API Functional Testing - url: /get-started/web-api-functional-testing.html - -- - - label: Functional Areas children: - label: Advanced Reporting - url: /advanced-reporting/overview.html + url: exclude_versions: ['2.0','2.1'] - label: Checkout @@ -173,27 +77,7 @@ - label: Order Management url: http://omsdocs.magento.com/en/ - - label: Payment Integrations - url: /payments-integrations/bk-payments-integrations.html - - - label: Staging - url: /extension-dev-guide/staging.html - exclude_versions: ['2.0'] - -- label: Tutorials +- label: Old Documantation children: - - - label: Rest Tutorials - url: /rest/tutorials/index.html - exclude_versions: ['2.0'] - - - label: Customize Product Creation Form - url: /howdoi/customize_product.html - exclude_versions: ['2.0'] - - - label: Customize Checkout - url: /howdoi/checkout/checkout_overview.html - - - label: Magento Support - url: /community/resources/support.html - versionless: true + - label: Magento 1 Docs + url: / diff --git a/_data/toc/frontend-developer-guide.yml b/_data/toc/frontend-developer-guide.yml index 70cdcdd31e..f483872c85 100644 --- a/_data/toc/frontend-developer-guide.yml +++ b/_data/toc/frontend-developer-guide.yml @@ -4,6 +4,7 @@ pages: url: /frontend-dev-guide/bk-frontend-dev-guide.html - label: Conventional notations used in this Guide + include_versions: ["1.x"] url: /frontend-dev-guide/conventions.html - label: Magento cache overview @@ -16,9 +17,6 @@ pages: url: /frontend-dev-guide/themes/theme-general.html children: - - label: Themes overview - url: /frontend-dev-guide/themes/theme-overview.html - - label: Install a third-party storefront theme url: /frontend-dev-guide/themes/theme-install.html @@ -43,8 +41,8 @@ pages: - label: Magento theme structure url: /frontend-dev-guide/themes/theme-structure.html - - label: Theme inheritance - url: /frontend-dev-guide/themes/theme-inherit.html + - label: Theme fallback model + url: /frontend-dev-guide/themes/theme-fallback.html - label: Adding custom favicons url: /frontend-dev-guide/themes/favicon.html @@ -176,7 +174,7 @@ pages: url: /frontend-dev-guide/translations/translate_practice.html - label: Tools - include_versions: ["2.2", "2.3"] + include_versions: ["2.2", "2.3","1.x"] url: /frontend-dev-guide/tools/tools_overview.html children: diff --git a/_data/toc/installation-guide.yml b/_data/toc/installation-guide.yml index aefd73aec2..2ceb36c355 100644 --- a/_data/toc/installation-guide.yml +++ b/_data/toc/installation-guide.yml @@ -27,89 +27,34 @@ pages: - label: What is a docroot? url: /install-gde/basics/basics_docroot.html - - label: Getting Started - children: - - label: Helpful resources - url: /install-gde/install-resources-parent.html - children: - - - label: Installation quick reference (tutorial) - url: /install-gde/install-quick-ref.html - - - label: Installation flow diagram - url: /install-gde/install-resource-diagram.html - - - label: Installation roadmap (reference) - url: /install-gde/install-roadmap_part1.html - - label: Magento system requirements - url: /install-gde/system-requirements2.html - children: + - label: Prerequisites + url: /install-gde/prereq/prereq-overview.html + children: - - label: Magento technology stack requirements - url: /install-gde/system-requirements-tech.html + - label: Apache + url: /install-gde/prereq/apache.html - - label: Supported browsers - url: /install-gde/system-requirements_browsers.html + - label: nginx + url: /install-gde/prereq/nginx.html - - label: Transport Layer Security (TLS) requirements - children: + - label: PHP + url: /install-gde/prereq/php-settings.html - - label: TLS 1.2 requirement for PayPal - url: /install-gde/system-requirements_tls1-2.html + - label: MySQL + url: /install-gde/prereq/mysql.html - - label: TLS requirement for repo.magento.com - url: /install-gde/system-requirements_repo-tls1-2.html + - label: Get your authentication keys + url: /install-gde/prereq/connect-auth.html - - label: Prerequisites - url: /install-gde/prereq/prereq-overview.html + - label: Magento file system ownership and permissions children: - - label: Apache - url: /install-gde/prereq/apache.html - - - label: nginx - url: /install-gde/prereq/nginx.html - - - label: PHP - url: /install-gde/prereq/php-centos-ubuntu.html - include_versions: ["2.3"] - children: - - - label: Required PHP settings - url: /install-gde/prereq/php-settings.html - include_versions: ["2.3"] - - - label: PHP - include_versions: ["2.1", "2.2"] - children: - - - label: PHP for Centos - url: /install-gde/prereq/php-centos.html - include_versions: ["2.1", "2.2"] - - - label: PHP for Ubuntu - url: /install-gde/prereq/php-ubuntu.html - include_versions: ["2.1", "2.2"] - - - label: Required PHP settings - url: /install-gde/prereq/php-settings.html - include_versions: ["2.1", "2.2"] - - - label: MySQL - url: /install-gde/prereq/mysql.html - - - label: Get your authentication keys - url: /install-gde/prereq/connect-auth.html - - - label: Magento file system ownership and permissions - children: - - - label: Overview of ownership and permissions - url: /install-gde/prereq/file-sys-perms-over.html + - label: Overview of ownership and permissions + url: /install-gde/prereq/file-sys-perms-over.html - - label: Set pre-installation ownership and permissions - url: /install-gde/prereq/file-system-perms.html + - label: Set pre-installation ownership and permissions + url: /install-gde/prereq/file-system-perms.html - label: RabbitMQ url: /install-gde/prereq/install-rabbitmq.html @@ -159,11 +104,11 @@ pages: - label: Update installation dependencies url: /install-gde/install/prepare-install.html - - label: Get help with your installation - url: /install-gde/install/get-help.html + - label: Get help with your installation + url: /install-gde/install/get-help.html - - label: Install options - url: /install-gde/continue-to-install.html + - label: Install options + url: /install-gde/continue-to-install.html - label: Setup Wizard Install children: diff --git a/_data/toc/rest-api.yml b/_data/toc/rest-api.yml index daa9c75134..15fc1b0142 100644 --- a/_data/toc/rest-api.yml +++ b/_data/toc/rest-api.yml @@ -1,40 +1,17 @@ label: REST API Reference pages: - - label: Overview - url: /rest/bk-rest.html + - label: Introduction + url: api/rest/introduction.html - - label: Quick reference + - label: Authentication children: - - label: REST Endpoints (Swagger) - include_versions: ["2.0"] - url: http://devdocs.magento.com/swagger/index_20.html + - label: Authentication + url: /api/rest/authentication/oauth_authentication.html - - label: REST Endpoints (Swagger) - include_versions: ["2.1"] - url: http://devdocs.magento.com/swagger/index_21.html - - - label: REST Endpoints (Swagger) - include_versions: ["2.2"] - url: http://devdocs.magento.com/swagger/index_22.html - - - label: REST Endpoints (ReDoc) - include_versions: ["2.3"] - url: /redoc/2.3/ + - label: OAuth Configuration + url: /api/rest/authentication/oauth_configuration.html versionless: true - children: - - - label: Admin REST endpoints - url: /redoc/2.3/admin-rest-api.html - versionless: true - - - label: Customer REST endpoints - url: /redoc/2.3/customer-rest-api.html - versionless: true - - - label: Guest REST endpoints - url: /redoc/2.3/guest-rest-api.html - versionless: true - + - label: List of REST endpoints by module url: /rest/list.html @@ -44,36 +21,6 @@ pages: - label: Generate a local API reference url: /rest/generate-local.html - - label: Use REST endpoints - children: - - label: Search using REST - url: /rest/performing-searches.html - - - label: Retrieve filtered search responses - url: /rest/retrieve-filtered-responses.html - - - label: Restricting access to anonymous web APIs - url: /rest/anonymous-api-security.html - - - label: Asynchronous web endpoints - include_versions: ["2.3"] - url: /rest/asynchronous-web-endpoints.html - - - label: Bulk endpoints - include_versions: ["2.3"] - url: /rest/bulk-endpoints.html - - - label: Bulk operation status endpoints - include_versions: ["2.3"] - url: /rest/operation-status-endpoints.html - - - label: Search for the status of a bulk operation - include_versions: ["2.3"] - url: /rest/operation-status-search.html - - - label: Parameters in URLs - url: /rest/notes.html - - label: Tutorials url: /rest/tutorials/index.html include_versions: ["2.1", "2.2", "2.3"] diff --git a/_data/var.yml b/_data/var.yml index 1e23a8cc99..b9da503435 100644 --- a/_data/var.yml +++ b/_data/var.yml @@ -12,7 +12,7 @@ #NOTE: The new product name variables use the old product name abbreviations (e.g., ce, ee, ece, b2b). # Product Name variables - +om: OpenMage Magento-LTS ce: Magento Open Source ee: Magento Commerce b2b: Magento Commerce for B2B diff --git a/_includes/config/locate-session.md b/_includes/config/locate-session.md index 64d25fa8f0..f193612bb9 100644 --- a/_includes/config/locate-session.md +++ b/_includes/config/locate-session.md @@ -2,7 +2,7 @@ This topic discusses how to locate where your session files are stored. The Magento application uses the following logic to store session files: -* If you configured memcached, sessions are stored in RAM; for more information, see [Use memcached for session storage]({{ page.baseurl }}/config-guide/memcache/memcache.html). +* If you configured memcached, sessions are stored in RAM; for more information, see [Use memcached for session storage]({{ page.baseurl }}/). * If you configured Redis, sessions are stored on the Redis server; for more information, see [Use Redis for page caching or session storage]({{ page.baseurl }}/config-guide/redis/config-redis.html). * If you're using the default file-based session storage, we store sessions in the following locations in the order shown: diff --git a/_includes/install/flow-diagram.md b/_includes/install/flow-diagram.md index b95847b68f..3c08db5501 100644 --- a/_includes/install/flow-diagram.md +++ b/_includes/install/flow-diagram.md @@ -1,25 +1,22 @@ -![How Magento installation works]({{ site.baseurl }}/common/images/install_diagram.png){:width="1100px"} +![How Magento installation works]({{ site.baseurl }}/common/images/installation/installation-flow.png) The diagram shows the following: 1. Set up your server environment. - Install the prerequisite software, including PHP, Apache, and MySQL. Consult the system requirements for specific information: + Install the prerequisite software, including PHP, Apache, and MySQL. Consult the [system requirements]({{ site.v1xgdeurl }}/system-requirements.html) for specific information: - * [2.0.x system requirements]({{ site.gdeurl }}install-gde/system-requirements.html) - * [2.1.x system requirements]({{ site.gdeurl21 }}install-gde/system-requirements-tech.html) - * [2.2.x system requirements]({{ site.gdeurl22 }}install-gde/system-requirements-tech.html) +2. Get the Magento LTS software. -2. Get the Magento software. + * Download the latest archive and extract it, clone the repo, or add a composer dependency to your existing project like so: +```json +"openmage/magento-lts": "1.9.4.x" +``` - * For simplicity, get a compressed {{site.data.var.ce}} or {{site.data.var.ee}} [archive]({{ page.baseurl }}/install-gde/prereq/zip_install.html), extract it on your Magento server, and start your installation. + * Use one of the two compose install - * If you are more technical and you are familiar with Composer, get a {{site.data.var.ce}} or {{site.data.var.ee}} {% if page.guide_version == "2.0" %} [metapackage]({{page.baseurl}}/install-gde/prereq/integrator_install.html) {% else %} [metapackage]({{page.baseurl}}/install-gde/composer.html). {% endif %} + * If you want to contribute to the {{site.data.var.om}} codebase, customize the Magento application or fix and test your own code, [fork]({{ page.baseurl }}/install-gde/prereq/dev_install.html) the Magento-LTS GitHub repository. (This method requires familiarity with both GitHub.) Follow [Contributor] - * If you want to contribute to the {{site.data.var.ce}} codebase or customize the Magento application, [clone]({{ page.baseurl }}/install-gde/prereq/dev_install.html) the Magento 2 GitHub repository. (This method requires familiarity with both GitHub and Composer.) - - {:.bs-callout .bs-callout-info} - To be able to use the Web Setup Wizard to install or upgrade the Magento software, or to manage extensions you get from Magento Marketplace, you must either get a compressed archive or a Composer metapackage. If you clone the GitHub repository, you *cannot* use the Web Setup Wizard to upgrade the Magento software and extensions. You must upgrade using [Composer and Git commands]({{ page.baseurl }}/install-gde/install/cli/dev_options.html). 3. Install the Magento software using either the Web Setup Wizard or command line. @@ -27,6 +24,6 @@ The diagram shows the following: At each step, the Web Setup Wizard validates the information you entered. As shown in the preceding diagram, if validation fails, you must manually fix the issues before you proceed. - If the step fails because prerequisite software isn't set up correctly, review our [Prerequisites]({{ page.baseurl }}/install-gde/prereq/prereq-overview.html). + If the step fails because prerequisite software isn't set up correctly, review our [Prerequisites]({{ site.v1xgdeurl}}/install-gde/prereq/prereq-overview.html). 4. Verify the installation by viewing your storefront and the Magento Admin. diff --git a/_includes/install/php-extensions-template.md b/_includes/install/php-extensions-template.md new file mode 100644 index 0000000000..023dba619e --- /dev/null +++ b/_includes/install/php-extensions-template.md @@ -0,0 +1,25 @@ +* ext-ctype + +* ext-curl + +* ext-gd + +* ext-iconv + +* ext-json + +* ext-intl + +* ext-mbstring + +* ext-openssl + +* ext-pdo + +* ext-pdo_mysqli + +* ext-soap + +* ext-simplexml + +* ext-sockets \ No newline at end of file diff --git a/_includes/install/php-versions-1.9.md b/_includes/install/php-versions-1.9.md new file mode 100644 index 0000000000..f24d94e775 --- /dev/null +++ b/_includes/install/php-versions-1.9.md @@ -0,0 +1,4 @@ +Magento LTS supports PHP 7.3. + +{:.bs-callout-warning} +PHP 7.1 has reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software. diff --git a/_includes/layout/header-styles.html b/_includes/layout/header-styles.html index 4502aeb6e6..554ce13322 100644 --- a/_includes/layout/header-styles.html +++ b/_includes/layout/header-styles.html @@ -1,2 +1,3 @@ + diff --git a/_includes/layout/header.html b/_includes/layout/header.html new file mode 100644 index 0000000000..ade522baa8 --- /dev/null +++ b/_includes/layout/header.html @@ -0,0 +1,34 @@ + + + + + + + + {% if page.title %}{{ page.title }} | {% endif %}{{ site.title }} + + + + + + {% include layout/header-styles.html %} + {% include layout/header-scripts.html %} + + + + + + + + + +
+ + {% include layout/after-site-header.html %} + +
+ diff --git a/_includes/layout/main-nav-item.html b/_includes/layout/main-nav-item.html index e772578a7f..c704432a4b 100644 --- a/_includes/layout/main-nav-item.html +++ b/_includes/layout/main-nav-item.html @@ -15,7 +15,7 @@ {% if page.guide_version %} {% assign base = page.baseurl %} {% else %} - {% assign base = site.version | prepend: "/guides/v" | prepend: site.baseurl %} + {% assign base = site.version | prepend: "/guides/v19.x" | prepend: site.baseurl %} {% endif %} {% endif %} {% if item.url contains 'http' %} diff --git a/_includes/layout/nav-item.html b/_includes/layout/nav-item.html index 68f2946ce0..9decfa3630 100644 --- a/_includes/layout/nav-item.html +++ b/_includes/layout/nav-item.html @@ -15,7 +15,7 @@ {% if page.guide_version %} {% assign base = page.baseurl %} {% else %} - {% assign base = site.version | prepend: "/guides/v" | prepend: site.baseurl %} + {% assign base = site.version | prepend: "/guides/v19.x" | prepend: site.baseurl %} {% endif %} {% endif %} {% if item.url contains 'http' %} diff --git a/_includes/layout/page-info.html b/_includes/layout/page-info.html index f7bb0f4249..113cb170f8 100644 --- a/_includes/layout/page-info.html +++ b/_includes/layout/page-info.html @@ -29,4 +29,16 @@ {% endif %} +{% if page.side_toc %} + +{% endif %} +
diff --git a/_includes/layout/site-nav.html b/_includes/layout/site-nav.html index 230d8da39a..d0e127b833 100644 --- a/_includes/layout/site-nav.html +++ b/_includes/layout/site-nav.html @@ -6,8 +6,25 @@