summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-09-09 09:31:22 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-09-09 09:31:22 -0700
commit76269ca7a63848aee1f141da75be8ca436bf9e6c (patch)
tree3be0d1b978019ca825262a48bc4e18a34bdbf3f4 /docs
parent17099706034d3ae2c63743488f076ed1dab286b7 (diff)
parentad17b552b8f7c3a435ad8de71cd7268f905a1b8d (diff)
downloadscala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.gz
scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.bz2
scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.zip
Merge pull request #4732 from SethTisue/merge-2.11.x-sep-8
Merge 2.11.x into 2.12.x [ci: last-only]
Diffstat (limited to 'docs')
-rw-r--r--docs/TODO2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/TODO b/docs/TODO
index 094202f53e..558aa87205 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -53,7 +53,7 @@
The process is about the same for symbols in PolyTypes. The main
difference is that type parameters may be referenced and thus we
- need something like De Bruijn indicies to represent these
+ need something like De Bruijn indices to represent these
references.