Skip to content

Commit

Permalink
docs: Updates docs to add mentions of beta (#44)
Browse files Browse the repository at this point in the history 
* Updates to `beta` from `main`

* Adds note about `beta` branch for open-sauced/hot

* Improves visual formatting of note

* Remove metion of `beta` and `main`.

* Removes mention of `main` branch and note

Replaces with `default branch`

* Update docs/technical/resolve-merge-conflicts.md

* Update docs/technical/resolve-merge-conflicts.md

* Update docs/technical/resolve-merge-conflicts.md

* Updates documentation to be branch agnostic

* Apply suggestions from code review

I was wrong about HEAD

---------

Co-authored-by: Brian Douglas <bdougie@users.noreply.github.com> 97c699c
  • Loading branch information
@bdougie
bdougie committed Mar 14, 2023
1 parent 3cc3e40 commit 6d2c780
Show file tree
Hide file tree
Showing 47 changed files with 99 additions and 99 deletions.
8 changes: 4 additions & 4 deletions 404.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<link rel="mask-icon" href="/img/logo.svg" color="rgb(37, 194, 160)">
<meta name="msapplication-TileImage" content="/img/logo.svg">
<meta name="msapplication-TileColor" content="#000"><title data-react-helmet="true">Page Not Found | Open Sauced</title><meta data-react-helmet="true" property="og:title" content="Page Not Found | Open Sauced"><meta data-react-helmet="true" name="twitter:card" content="summary_large_image"><meta data-react-helmet="true" property="og:url" content="https://docs.opensauced.pizza/404.html"><meta data-react-helmet="true" name="docsearch:language" content="en"><meta data-react-helmet="true" name="docsearch:docusaurus_tag" content="default"><link data-react-helmet="true" rel="shortcut icon" href="/img/favicon.ico"><link data-react-helmet="true" rel="canonical" href="https://docs.opensauced.pizza/404.html"><link data-react-helmet="true" rel="alternate" href="https://docs.opensauced.pizza/404.html" hreflang="en"><link data-react-helmet="true" rel="alternate" href="https://docs.opensauced.pizza/404.html" hreflang="x-default"><link data-react-helmet="true" rel="preconnect" href="https://BH4D9OD16A-dsn.algolia.net" crossorigin="anonymous"><link rel="stylesheet" href="/assets/css/styles.66ee3f3c.css">
<link rel="preload" href="/assets/js/runtime~main.9bbec9c9.js" as="script">
<link rel="preload" href="/assets/js/main.0ea61737.js" as="script">
<link rel="preload" href="/assets/js/runtime~main.cd415ac7.js" as="script">
<link rel="preload" href="/assets/js/main.0b012a1a.js" as="script">
</head>
<body>
<script>!function(){function t(t){document.documentElement.setAttribute("data-theme",t)}var e=function(){var t=null;try{t=localStorage.getItem("theme")}catch(t){}return t}();t(null!==e?e:"light")}()</script><div id="__docusaurus">
<div><a href="#" class="skipToContent_1oUP">Skip to main content</a></div><nav class="navbar navbar--fixed-top"><div class="navbar__inner"><div class="navbar__items"><button aria-label="Navigation bar toggle" class="navbar__toggle clean-btn" type="button" tabindex="0"><svg width="30" height="30" viewBox="0 0 30 30" aria-hidden="true"><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M4 7h22M4 15h22M4 23h22"></path></svg></button><a href="https://opensauced.pizza/" target="_blank" rel="noopener noreferrer" class="navbar__brand"><div class="navbar__logo"><img src="/img/logo_lightmode.png" alt="Open Sauced Logo" class="themedImage_1VuW themedImage--light_3UqQ"><img src="/img/logo_darkmode.png" alt="Open Sauced Logo" class="themedImage_1VuW themedImage--dark_hz6m"></div></a><a class="navbar__item navbar__link" href="/">Docs</a><a href="https://opensauced.pizza/" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link" alt="Open Sauced Logo" src="img/logo.svg"></a><a href="https://dev.to/opensauced" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link"><span>Blog<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a><a href="https://github.com/open-sauced/docs.opensauced.pizza" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link"><span>GitHub<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a><a href="https://discord.gg/U2peSNf23P" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link"><span>Discord<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></div><div class="navbar__items navbar__items--right"><a href="https://opensauced.pizza/" target="_blank" rel="noopener noreferrer" class="navbar__item navbar__link"><span>Open Sauced<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a><div class="toggle_71bT toggle_3Zt9 toggleDisabled_3cF-"><div class="toggleTrack_32Fl" role="button" tabindex="-1"><div class="toggleTrackCheck_3lV7"><span class="toggleIcon_O4iE">🌜</span></div><div class="toggleTrackX_S2yS"><span class="toggleIcon_O4iE">🌞</span></div><div class="toggleTrackThumb_xI_Z"></div></div><input type="checkbox" class="toggleScreenReader_28Tw" aria-label="Switch between dark and light mode"></div><div class="searchBox_1Doo"><button type="button" class="DocSearch DocSearch-Button" aria-label="Search"><span class="DocSearch-Button-Container"><svg width="20" height="20" class="DocSearch-Search-Icon" viewBox="0 0 20 20"><path d="M14.386 14.386l4.0877 4.0877-4.0877-4.0877c-2.9418 2.9419-7.7115 2.9419-10.6533 0-2.9419-2.9418-2.9419-7.7115 0-10.6533 2.9418-2.9419 7.7115-2.9419 10.6533 0 2.9419 2.9418 2.9419 7.7115 0 10.6533z" stroke="currentColor" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"></path></svg><span class="DocSearch-Button-Placeholder">Search</span></span><span class="DocSearch-Button-Keys"></span></button></div></div></div><div role="presentation" class="navbar-sidebar__backdrop"></div></nav><div class="main-wrapper"><main class="container margin-vert--xl"><div class="row"><div class="col col--6 col--offset-3"><h1 class="hero__title">Page Not Found</h1><p>We could not find what you were looking for.</p><p>Please contact the owner of the site that linked you to the original URL and let them know their link is broken.</p></div></div></main></div><footer class="footer footer--dark"><div class="container"><div class="row footer__links"><div class="col footer__col"><div class="footer__title">Docs</div><ul class="footer__items"><li class="footer__item"><a class="footer__link-item" href="/contributing/introduction-to-contributing/">Contributing guide</a></li><li class="footer__item"><a class="footer__link-item" href="/technical/dark-mode-explained/">Technical guide</a></li><li class="footer__item"><a class="footer__link-item" href="/maintainers/setting-up-a-new-repository/">Maintainer guide</a></li></ul></div><div class="col footer__col"><div class="footer__title">Community</div><ul class="footer__items"><li class="footer__item"><a href="https://github.com/open-sauced/open-sauced/discussions" target="_blank" rel="noopener noreferrer" class="footer__link-item"><span>GitHub<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></li><li class="footer__item"><a href="https://discord.com/invite/U2peSNf23P" target="_blank" rel="noopener noreferrer" class="footer__link-item"><span>Discord<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></li><li class="footer__item"><a href="https://twitter.com/saucedopen" target="_blank" rel="noopener noreferrer" class="footer__link-item"><span>Twitter<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></li></ul></div><div class="col footer__col"><div class="footer__title">More</div><ul class="footer__items"><li class="footer__item"><a href="https://dev.to/opensauced" target="_blank" rel="noopener noreferrer" class="footer__link-item"><span>Blog<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></li><li class="footer__item"><a href="https://docs.opensauced.pizza/open-sauced-docs.pdf" target="_blank" rel="noopener noreferrer" class="footer__link-item"><span>Download book<svg width="13.5" height="13.5" aria-hidden="true" viewBox="0 0 24 24" class="iconExternalLink_3J9K"><path fill="currentColor" d="M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z"></path></svg></span></a></li></ul></div></div><div class="footer__bottom text--center"><div class="margin-bottom--sm"><a href="https://opensauced.pizza/" target="_blank" rel="noopener noreferrer" class="footerLogoLink_MyFc"><img src="/img/logo.svg" alt="Open Sauced Logo" class="themedImage_1VuW themedImage--light_3UqQ footer__logo"><img src="/img/logo.svg" alt="Open Sauced Logo" class="themedImage_1VuW themedImage--dark_hz6m footer__logo"></a></div><div class="footer__copyright">Copyright © 2023 Open Sauced. Built with Docusaurus.</div></div></div></footer></div>
<script src="/assets/js/runtime~main.9bbec9c9.js"></script>
<script src="/assets/js/main.0ea61737.js"></script>
<script src="/assets/js/runtime~main.cd415ac7.js"></script>
<script src="/assets/js/main.0b012a1a.js"></script>
</body>
</html>
1 change: 0 additions & 1 deletion assets/js/389594df.3b658f2a.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions assets/js/389594df.f9fcb300.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/js/47120859.0729a795.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6d2c780

Please sign in to comment.