diff --git a/doc/config.txt b/doc/config.txt index ed1a3ca..2118f4c 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -145,7 +145,7 @@ let's come back to the default value value The value is saved in a :class:`~tiramisu.value.Value` object. It is on this -object that we have to trigger the `reset`, wich take the option itself +object that we have to trigger the `reset`, which take the option itself (`var2`) as a parameter. On the other side, in the `read_only` mode, it is not possible to modify the value @@ -415,7 +415,7 @@ A multi-option's value can be manipulated like a list:: >>> print c.od1.var1 [u'var1'] -But it is not possible to set a value to a multi-option wich is not a list:: +But it is not possible to set a value to a multi-option which is not a list:: >>> c.od1.var1 = u'error' Traceback (most recent call last): @@ -543,6 +543,6 @@ Here are the (useful) methods on ``Config`` (or `SubConfig`). A :class:`~config.CommonConfig` is a abstract base class. A :class:`~config.SubConfig` is an just in time created objects that wraps an ::class:`~option.OptionDescription`. A SubConfig differs from a Config in the -::fact that a config is a root object and has an environnement, a context wich -::defines the different properties, access rules, vs... There is generally only -::one Config, and many SubConfigs. +fact that a config is a root object and has an environnement, a context which +defines the different properties, access rules, vs... There is generally only +one Config, and many SubConfigs. diff --git a/doc/getting-started.txt b/doc/getting-started.txt index 13cc8f2..a2f6a74 100644 --- a/doc/getting-started.txt +++ b/doc/getting-started.txt @@ -14,7 +14,7 @@ introduced... What is Tiramisu ? =================== -Tiramisu is an options handler and an options controller, wich aims at +Tiramisu is an options handler and an options controller, which aims at producing flexible and fast options access. The main advantages are its access rules and the fact that the whole consistency is preserved at any time, see :doc:`consistency`. There is of course type and structure validations, but also @@ -65,7 +65,7 @@ So by now, we have: - a namespace (which is `c` here) - the access of an option's value by the - attribute access way (here `bool`, wich is a boolean option + attribute access way (here `bool`, which is a boolean option :class:`~tiramisu.option.BoolOption()`. So, option objects are produced at the entry point `c` and then handed down to