about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-08-30 01:43:46 +0200
committerGitHub <noreply@github.com>2020-08-30 01:43:46 +0200
commitfe43918c38ec16d6ef8bd4b4cff515a124a14848 (patch)
treeb78cb30e0a5f25a8ddcc0d9b223555e384b15fd0
parent5511e73eb4ec853df757e9f1f60fde988778a3a9 (diff)
parent1831f652889eff1928c9f68dc6a1df8befefda88 (diff)
downloadrust-fe43918c38ec16d6ef8bd4b4cff515a124a14848.tar.gz
rust-fe43918c38ec16d6ef8bd4b4cff515a124a14848.zip
Rollup merge of #75892 - ArekPiekarz:unstable_book_tls_model_typo, r=petrochenkov
Fix typo in TLS Model in Unstable Book
-rw-r--r--src/doc/unstable-book/src/compiler-flags/tls-model.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/unstable-book/src/compiler-flags/tls-model.md b/src/doc/unstable-book/src/compiler-flags/tls-model.md
index 0aefaa7fb01..cd625f3fd09 100644
--- a/src/doc/unstable-book/src/compiler-flags/tls-model.md
+++ b/src/doc/unstable-book/src/compiler-flags/tls-model.md
@@ -22,4 +22,4 @@ The TLS data must not be in a library loaded after startup (via `dlopen`).
 but not in a shared library, and is accessed only from that executable.
 
 `rustc` and LLVM may use a more optimized model than specified if they know that we are producing
-and executable rather than a library, or that the `static` item is private enough.
+an executable rather than a library, or that the `static` item is private enough.