Skip to content

Commit

Permalink
Clean up doc structure (#3359)
Browse files Browse the repository at this point in the history
  • Loading branch information
achamayou authored Jan 11, 2022
1 parent b28e7cf commit 1932a2d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 30 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ doxygen/
obj/
*.retry
tests/env/
getting_started/create_vm/generated
sphinx/env/
html/
latex/
Expand Down
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ doxygen/
obj/
*.retry
tests/env/
getting_started/create_vm/generated
sphinx/env/
html/
latex/
Expand Down
5 changes: 1 addition & 4 deletions doc/build_apps/build_app.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
Build and Sign CCF Applications
===============================

.. note:: Before building a CCF application, make sure that:

- The CCF development environment has successfully been setup (see :doc:`/build_apps/build_setup`).
- CCF is installed (see :doc:`/build_apps/install_bin`).
.. note:: Before building a CCF application, make sure that CCF is installed (see :doc:`/build_apps/install_bin`).

Once an application is complete, it needs to be built into a shared object, and signed.

Expand Down
16 changes: 0 additions & 16 deletions doc/build_apps/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,13 @@ These endpoints can read or mutate the state of a unique :ref:`build_apps/kv/ind

.. panels::

:fa:`cloud` :doc:`create_vm`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Create a SGX-enabled Azure Virtual Machine.

---

:fa:`download` :doc:`install_bin`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Install CCF on Linux.

---

:fa:`laptop-code` :doc:`build_setup`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Setup CCF environment to build CCF apps.

---

.. image:: ../img/cpp.svg
:width: 22
:alt: C++
Expand Down Expand Up @@ -97,9 +83,7 @@ These endpoints can read or mutate the state of a unique :ref:`build_apps/kv/ind
.. toctree::
:hidden:

create_vm
install_bin
build_setup
example
js_app
build_app
Expand Down
7 changes: 6 additions & 1 deletion doc/build_apps/install_bin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ The CCF install notably contains:

- The ``cchost`` binary required to spin up a CCF application
- The ``cmake`` files required to build CCF applications
- The ``ansible`` playbooks required for :doc:`build_setup` (under ``getting_started/``)
- The ``ansible`` playbooks required for :doc:`/contribute/build_setup` (under ``getting_started/``)
- Header files and libraries to build CCF applications (under ``include/`` and ``lib/``)
- A limited set of Python utilities to start a basic CCF service for local testing
- Various utility scripts (see :doc:`/build_apps/demo`)
Expand All @@ -74,3 +74,8 @@ To remove an installation of CCF, run:
.. code-block:: bash
$ sudo apt remove ccf
From Source
-----------

To build and install CCF from source, please see :doc:`/contribute/build_ccf`.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions doc/contribute/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ The CCF team welcome contributions to any part of the framework, including this
.. panels::


:fa:`cloud` :doc:`/build_apps/create_vm`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
:fa:`cloud` :doc:`create_vm`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Create a SGX-enabled Azure Virtual Machine.

---

:fa:`laptop-code` :doc:`/build_apps/build_setup`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
:fa:`laptop-code` :doc:`build_setup`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Setup CCF environment to CCF from source.
Setup CCF environment to build CCF from source.

---

Expand Down Expand Up @@ -53,8 +53,8 @@ The CCF team welcome contributions to any part of the framework, including this
:maxdepth: 1
:hidden:

/build_apps/create_vm
/build_apps/build_setup
create_vm
build_setup
build_ccf
release_ccf
design/index
Expand Down

0 comments on commit 1932a2d

Please sign in to comment.