From b410f309b7b3f8de2d1e47b7e150b0c46ef3661c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 15 Sep 2019 21:00:49 +0200 Subject: [PATCH 1/3] link to older docs from the book --- book/en/src/preface.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/book/en/src/preface.md b/book/en/src/preface.md index 15aaea5ce7..1728062b67 100644 --- a/book/en/src/preface.md +++ b/book/en/src/preface.md @@ -11,7 +11,10 @@ There is a translation of this book in [Russian]. [Russian]: ../ru/index.html -**HEADS UP** This is an **alpha** pre-release; there may be breaking changes in +This is the documentation of v0.5.x of RTFM; for the documentation of version +v0.4.x go [here](../../0.4/book/en). + +**HEADS UP** This is a **beta** pre-release; there may be breaking changes in the API and semantics before a proper release is made. {{#include ../../../README.md:5:44}} From f787d82d927ec49b2cd9e931d4191bce2bc1b95c Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sun, 15 Sep 2019 21:26:30 +0200 Subject: [PATCH 2/3] Updated links in README for rtfm.rs --- Cargo.toml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d1ca31661d..70606c881f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ authors = [ ] categories = ["concurrency", "embedded", "no-std"] description = "Real Time For the Masses (RTFM): a concurrency framework for building real time systems" -documentation = "https://rtfm-rs.github.io/cortex-m-rtfm/book/en" +documentation = "https://rtfm.rs/" edition = "2018" keywords = ["arm", "cortex-m"] license = "MIT OR Apache-2.0" diff --git a/README.md b/README.md index ff33da9859..68f3fbb7d3 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ A concurrency framework for building real time systems. - Applications must be written using the 2018 edition. -## [User documentation](https://japaric.github.io/rtfm5/book/en) +## [User documentation](https://rtfm.rs) -## [API reference](https://japaric.github.io/rtfm5/api/rtfm/index.html) +## [API reference](https://rtfm.rs/api/rtfm/index.html) ## Acknowledgments From c67e039c195a2024d4aed33d4b4ffe035ca2b7be Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 15 Sep 2019 22:28:52 +0200 Subject: [PATCH 3/3] fix install script --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install.sh b/ci/install.sh index aa7012050e..cbc2125b5d 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -4,7 +4,7 @@ main() { # these are not needed for doc builds if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then if [ $TARGET = x86_64-unknown-linux-gnu ]; then - ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.3 -f ) + ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.2 -f ) rustup target add thumbv6m-none-eabi thumbv7m-none-eabi fi