New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge manual repository as subtree into the manual
directory of the main repo.
#619
Open
cascremers
wants to merge
825
commits into
tamarin-prover:develop
Choose a base branch
from
cascremers:merge-manual
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Installation notes: Tamarin via Linuxbrew
…ts, and their practical repercussions.
…em persistent right away (dropped 'permanent').
…ranches The repository of the manual now has /master and /develop branches to mirror those of the main Tamarin source code repository,
Added syntax description of rule annotations (currently only colouring)
Added oracle heuristic documentation.
Add installation instructions for Arch Linux
…g as baseline, rather than the consecutive.
…g as baseline, rather than the consecutive. List flag in available flags list.
…Command Line within 003_example.md
Add comment about use of --quit-on-warning to 003_example.md
As of a recent version of Nixpkgs, `tamarin-prover` is a maintained, upstream package, along with Maude/SAPIC configured for it, out of the box. We're using a recent snapshot version of tamarin 1.3.0 from the `develop` branch, built with GHC 8.2.2. I've tested the TLS handshake examples with this build which seems to work fine. This simply adds manual instructions that Nix/NixOS users will be familiar with.
… HTML. Correct Haskell Stack link in Readme
Add license to MarkDown files
Issue535 type doc
Add macros to the tamarin manual
* subterms and numbers * image positioning --------- Authored by @PhilipLukertWork Co-authored-by: Ralf Sasse <ralf.sasse@gmail.com>
Fix outdated link
Update/clean up on sapic+ features
Fetch updates from master
Updated derivchecks section
This first version of the PR has no changes to the deployment scripts, but since they are now no longer in the root directory, I would expect all auto-deployment to have stopped working. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Until now, the main code repository and manual repository were separate.
This had several disadvantages, but the main one was to keep the pull requests in sync, where we wanted code pull request authors to also submit a PR for the manual in parallel.
This merge is the result of using
git subtree
to merge the manual repository into themanual
subdirectory of the code repository.TODO: Modify deployment scripts to re-enable automatic deployment of the manual.