about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCorey Richardson <corey@octayn.net>2014-12-05 10:07:04 -0800
committerCorey Richardson <corey@octayn.net>2014-12-05 10:07:04 -0800
commitfb55cbda8dcdbfe2b5619691d1f80d542fb9fc58 (patch)
treeaf48a42de4a0e0d6993ac350e275d980fa9719bc /src
parentf2b81888c1a81bbb93260ccfab253d403084582d (diff)
parentebf22cbf6a1821a808ca3b11708cf2f4dc60c0a8 (diff)
downloadrust-fb55cbda8dcdbfe2b5619691d1f80d542fb9fc58.tar.gz
rust-fb55cbda8dcdbfe2b5619691d1f80d542fb9fc58.zip
rollup merge of #19462: MatejLach/but-and_guide
Using `and` here instead of `but` sounds better to me, as but makes it sound like an item which is still under active development shouldn't normally require more testing, but this one does - or something like that :-)
@steveklabnik?
Diffstat (limited to 'src')
-rw-r--r--src/doc/guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index ce5730ad9ce..45bff480f7b 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -2861,7 +2861,7 @@ parts of your library. The six levels are:
 * experimental: This item was only recently introduced or is otherwise in a
   state of flux. It may change significantly, or even be removed. No guarantee
   of backwards-compatibility.
-* unstable: This item is still under development, but requires more testing to
+* unstable: This item is still under development and requires more testing to
   be considered stable. No guarantee of backwards-compatibility.
 * stable: This item is considered stable, and will not change significantly.
   Guarantee of backwards-compatibility.