align with updates in preparation for merging with the version for eos0.3.0

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 .vscode/
-build/
 build-send.sh
-utils/deploy.sh
+site/_build
-docs/_build
+site/_utils/docsearch_config.json
+site/_utils/docsearch_index.js
 .env

README.md

@@ -29,7 +29,7 @@ Install [pyenv](https://github.com/pyenv/pyenv)
 
 ## Development
 
-When editing these files, begin a livereload environment by running `make preview` while in the `./docs/` directory.
+When editing these files, begin a livereload environment by running `make preview` while in the `./site/` directory.
 
 When editing any css or table of contents organization changes, the livereload environment must be ended and `make clean` run before starting `make preview` again.
 

docs/source/index.rst

@@ -1,132 +0,0 @@
-.. title:: Start9 Documentation
-
-.. raw:: html
-
-  <div class="landing landing--floating">
-
-.. hero-box::
-  :title: Welcome to the Start9 Documentation
-  :button_icon: scylla-icon scylla-icon--monitoring
-  :button_url: https://docs.start9.com/getting-started/introduction/
-  :button_text: Start here
-  :image: /_static/img/icons/docs_info.png
-
-  Here you will find guidance and information about the Start9 Embassy personal server and its operating system, EmbassyOS.
-
-.. raw:: html
-
-  <div class="landing__content landing__content">
-
-.. raw:: html
-
-  <div class="topics-grid grid-container full">
-
-  <div class="grid-x grid-margin-x">
-
-.. topic-box::
-  :title: Purchasing
-  :link:   getting-started/purchasing
-  :icon: scylla-icon scylla-icon--bitcoin
-  :class: large-6
-  :anchor: Learn more
-
-  Learn about how you can purchase Start9 products.
-
-.. topic-box::
-  :title: Videos
-  :link: https://www.youtube.com/channel/UCGEw4HJDvOn3Oy8ykR36P7Q
-  :icon: scylla-icon scylla-icon--webinars
-  :class: large-6
-  :anchor: Learn more
-
-  Check out our how to and informational videos.
-
-.. topic-box::
-  :title: Support
-  :link: support
-  :icon: scylla-icon scylla-icon--support
-  :class: large-6
-  :anchor: Learn more
-
-  Read our FAQ and learn about platform concepts.
-
-.. topic-box::
-  :title: DIY
-  :link: getting-started/diy
-  :icon: scylla-icon scylla-icon--integrations
-  :class: large-6
-  :anchor: Learn more
-
-  Get started yourself with our Do It Yourself guide
-
-.. topic-box::
-  :title: About
-  :link: about
-  :icon: scylla-icon scylla-icon--about-team
-  :class: large-6
-  :anchor: Learn more
-
-  Explore Start9's mission and philosophy.
-
-.. topic-box::
-  :title: Contribute
-  :link: contributing
-  :icon: scylla-icon scylla-icon--apps
-  :class: large-6
-  :anchor: Learn more
-
-  Learn about developing for EmbassyOS or contribute to packing services for the marketplace.
-
-.. raw:: html
-
-  </div></div>
-
-.. raw:: html
-
-  </div></div>
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Getting Started
-  :hidden:
-
-  getting-started/introduction
-  getting-started/purchasing
-  getting-started/diy
-
-.. toctree::
-  :maxdepth: 2
-  :caption: User Manual
-  :hidden:
-
-  user-manual/initial-setup
-  user-manual/connecting
-  user-manual/general/index
-  user-manual/managing-services/index
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Misc Guides
-  :hidden:
-
-  misc-guides/available-services
-  misc-guides/bitcoin-cli
-  misc-guides/tor-os/index
-  misc-guides/tor-firefox/index
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Contributing
-  :hidden:
-
-  contributing/services/index
-  contributing/embassyos
-
-.. toctree::
-  :maxdepth: 2
-  :caption: Support
-  :hidden:
-
-  support/FAQ/index
-  support/concepts
-  support/contact

poetry.lock

@@ -24,17 +24,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "attrs"
-version = "21.2.0"
+version = "21.4.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "babel"
@@ -126,11 +126,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "importlib-metadata"
-version = "4.8.2"
+version = "4.10.0"
 description = "Read metadata from Python packages"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
@@ -139,7 +139,7 @@ zipp = ">=0.5"
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 perf = ["ipython"]
-testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
 name = "jinja2"
@@ -633,8 +633,8 @@ atomicwrites = [
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
 ]
 attrs = [
-    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
+    {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
-    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+    {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
 babel = [
     {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"},
@@ -673,8 +673,8 @@ imagesize = [
     {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"},
 ]
 importlib-metadata = [
-    {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"},
+    {file = "importlib_metadata-4.10.0-py3-none-any.whl", hash = "sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4"},
-    {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"},
+    {file = "importlib_metadata-4.10.0.tar.gz", hash = "sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6"},
 ]
 jinja2 = [
     {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},

site/source/contributing/index.rst

@@ -0,0 +1,17 @@
+Contributing
+============
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   embassyos
+   services/index
+
+.. panel-box::
+  :title: Overview
+  :id: contributing
+  :class: my-panel
+
+  * :doc:`Developer Contributions <embassyos>` - Learn how you can contribute to EmbassyOS
+  * :doc:`Service Packaging Guide <services/index>` - Learn more about packaging services for EmbassyOS