Skip to content
Snippets Groups Projects
Commit 30d1385e authored by Ralf Jung's avatar Ralf Jung
Browse files

Merge branch 'doc-style' into 'master'

More conventions in style guide

See merge request iris/iris!297
parents fe8938ea 96242aaf
No related branches found
No related tags found
No related merge requests found
...@@ -114,5 +114,8 @@ is used by clients. ...@@ -114,5 +114,8 @@ is used by clients.
* R: cameras * R: cameras
* UR: unital cameras or resources algebras * UR: unital cameras or resources algebras
* F: functors (can be combined with all of the above, e.g. OF is an OFE functor) * F: functors (can be combined with all of the above, e.g. OF is an OFE functor)
* G: global camera functor management * G: global camera functor management (typeclass; see `ProofGuide.md`)
* T: canonical structurs for algebraic classes (for example ofeT for OFEs, cmraT for cameras) * I: bunched implication logic (of type `bi`)
* SI: step-indexed bunched implication logic (of type `sbi`)
* T: canonical structures for algebraic classes (for example ofeT for OFEs, cmraT for cameras)
* Σ: global camera functor management (`gFunctors`; see `ProofGuide.md`)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment