diff --git a/doc/manual.md b/doc/manual.md index 5c36a0a7bc..31b13514d8 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -2623,12 +2623,12 @@ In a call `p(args)` where `p` may refer to more than one candidate, it is said to be a symbol choice. Overload resolution will attempt to find the best candidate, thus transforming the symbol choice into a resolved symbol. The routine `p` that matches best is selected following a series of trials explained below. -In order: Catagory matching, Hierarchical Order Comparison, and finally, Complexity Analysis. +In order: Category matching, Hierarchical Order Comparison, and finally, Complexity Analysis. If multiple candidates match equally well after all trials have been tested, the ambiguity is reported during semantic analysis. -First Trial: Catagory matching +First Trial: Category matching -------------------------------- Every arg in `args` needs to match and there are multiple different categories of matches. @@ -2689,7 +2689,7 @@ Matching formals for this type include `T`, `object`, `A`, `A[...]` and `A[C]` w is a generic typeclass composition and `T` is an unconstrained generic type variable. This list is in order of specificity with respect to `A` as each subsequent category narrows the set of types that are members of their match set. -In this trail, the formal parameters of candidates are compared in order (1st parameter, 2nd parameter, etc.) to search for +In this trial, the formal parameters of candidates are compared in order (1st parameter, 2nd parameter, etc.) to search for a candidate that has an unrivaled specificity. If such a formal parameter is found, the candidate it belongs to is chosen as the resolved symbol. diff --git a/readme.md b/readme.md index da54a8d0df..88f0b05d89 100644 --- a/readme.md +++ b/readme.md @@ -53,8 +53,8 @@ Nim programming language. Those C sources are available within the Next, to build from source you will need: - * A C compiler such as ``gcc`` 5.x/later or an alternative such as ``clang``, - ``Visual C++`` or ``Intel C++``. It is recommended to use ``gcc`` 5.x or + * A C compiler such as ``gcc`` 6.x/later or an alternative such as ``clang``, + ``Visual C++`` or ``Intel C++``. It is recommended to use ``gcc`` 6.x or later. * Either ``git`` or ``wget`` to download the needed source repositories. * The ``build-essential`` package when using ``gcc`` on Ubuntu (and likely