about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-09-06 18:28:08 -0600
committerGitHub <noreply@github.com>2017-09-06 18:28:08 -0600
commit66670584cf30de5b9a68c0eb8de68c45ee2836a0 (patch)
treef048a1b5964cebc464db1e380af1baa40080b455
parent435a5cdc6b9ef49874814aa6f90769e44cee35b7 (diff)
parent04cbf6eece5170e544680ebd24617f498b24cc92 (diff)
downloadrust-66670584cf30de5b9a68c0eb8de68c45ee2836a0.tar.gz
rust-66670584cf30de5b9a68c0eb8de68c45ee2836a0.zip
Rollup merge of #44377 - mathstuf:config.toml-typos, r=alexcrichton
config.toml.example: fix some typos
-rw-r--r--config.toml.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/config.toml.example b/config.toml.example
index 3f5101ebf34..266f4250132 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -146,10 +146,10 @@
 # option to true.
 #full-bootstrap = false
 
-# Enable a build of the and extended rust tool set which is not only the
-# compiler but also tools such as Cargo. This will also produce "combined
-# installers" which are used to install Rust and Cargo together. This is
-# disabled by default.
+# Enable a build of the extended rust tool set which is not only the compiler
+# but also tools such as Cargo. This will also produce "combined installers"
+# which are used to install Rust and Cargo together. This is disabled by
+# default.
 #extended = false
 
 # Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
@@ -175,7 +175,7 @@
 # script.
 #configure-args = []
 
-# Indicates that a local rebuild is ocurring instead of a full bootstrap,
+# Indicates that a local rebuild is occurring instead of a full bootstrap,
 # essentially skipping stage0 as the local compiler is recompiling itself again.
 #local-rebuild = false