aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-31 12:22:40 +0100
committerGitHub <[email protected]>2020-05-31 12:22:40 +0100
commitd7071eae2cb78547b8345d4c6ba2731a5151c049 (patch)
treec226b7548d749bb8ac9089a47d860e975e7fef47
parent09df51dab89340bcf4b8ede95c02c32b0c8eb2bc (diff)
parent5a2f4548e59981871fe4db2b9ee591b9bf39a46e (diff)
Merge #4668
4668: Rename user/readme.adoc -> user/manual.adoc r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--docs/user/manual.adoc (renamed from docs/user/readme.adoc)2
-rw-r--r--xtask/src/lib.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/user/readme.adoc b/docs/user/manual.adoc
index 12def7327..f40139804 100644
--- a/docs/user/readme.adoc
+++ b/docs/user/manual.adoc
@@ -19,7 +19,7 @@ https://microsoft.github.io/language-server-protocol/[Language Server Protocol]
19The LSP allows various code editors, like VS Code, Emacs or Vim, to implement semantic features like completion or goto definition by talking to an external language server process. 19The LSP allows various code editors, like VS Code, Emacs or Vim, to implement semantic features like completion or goto definition by talking to an external language server process.
20 20
21To improve this document, send a pull request against 21To improve this document, send a pull request against
22https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/readme.adoc[this file]. 22https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/manual.adoc[this file].
23 23
24If you have questions about using rust-analyzer, please ask them in the https://users.rust-lang.org/c/ide/14["`IDEs and Editors`"] topic of Rust users forum. 24If you have questions about using rust-analyzer, please ask them in the https://users.rust-lang.org/c/ide/14["`IDEs and Editors`"] topic of Rust users forum.
25 25
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 2b7a461e5..06043d19f 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -191,7 +191,11 @@ Release: release:{}[]
191 let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n)); 191 let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
192 fs2::write(&path, &contents)?; 192 fs2::write(&path, &contents)?;
193 193
194 fs2::copy(project_root().join("./docs/user/readme.adoc"), website_root.join("manual.adoc"))?; 194 for &adoc in ["manual.adoc", "generated_features.adoc"].iter() {
195 let src = project_root().join("./docs/user/").join(adoc);
196 let dst = website_root.join(adoc);
197 fs2::copy(src, dst)?;
198 }
195 199
196 let tags = run!("git tag --list"; echo = false)?; 200 let tags = run!("git tag --list"; echo = false)?;
197 let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap(); 201 let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();