Update doc links

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 3.5.4 - [#65](https://github.com/openfisca/country-template/pull/65)
+
+* Minor change
+* Details:
+  - Update links to the doc
+
 ### 3.5.3 - [#64](https://github.com/openfisca/country-template/pull/64)
 
 * Minor change
@@ -215,7 +221,7 @@ name: Household living in a 40 sq. metres accommodation while being free lodgers
 
 #### Python API
 
-When calculating an enum variable in Python, the output will be an [EnumArray](http://openfisca.readthedocs.io/en/latest/enum_array.html#module-openfisca_core.indexed_enums).
+When calculating an enum variable in Python, the output will be an [EnumArray](https://openfisca.org/doc/openfisca-python-api/enum_array.html).
 
 See more on the OpenFisca-Core [changelog](https://github.com/openfisca/openfisca-core/blob/enums-perfs/CHANGELOG.md#2102-589-600-605).
 

README.md

@@ -171,7 +171,7 @@ To serve the Openfisca Web API locally, run:
 openfisca serve --port 5000
 ```
 
-To read more about the `openfisca serve` command, check out its [documentation](https://openfisca.readthedocs.io/en/latest/openfisca_serve.html).
+To read more about the `openfisca serve` command, check out its [documentation](https://openfisca.org/doc/openfisca-python-api/openfisca_serve.html).
 
 You can make sure that your instance of the API is working by requesting:
 

openfisca_country_template/reforms/flat_social_security_contribution.py

@@ -2,7 +2,7 @@
 
 # This file defines a reform.
 # A reform is a set of modifications to be applied to a reference tax and benefit system to carry out experiments.
-# See https://openfisca.org/doc/reforms.html
+# See https://openfisca.org/doc/key-concepts/reforms.html
 
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca

openfisca_country_template/reforms/modify_social_security_taxation.py

@@ -2,7 +2,7 @@
 
 # This file defines a reform.
 # A reform is a set of modifications to be applied to a reference tax and benefit system to carry out experiments.
-# See https://openfisca.org/doc/reforms.html
+# See https://openfisca.org/doc/key-concepts/reforms.html
 
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca

openfisca_country_template/reforms/removal_basic_income.py

@@ -2,7 +2,7 @@
 
 # This file defines a reform.
 # A reform is a set of modifications to be applied to a reference tax and benefit system to carry out experiments.
-# See https://openfisca.org/doc/reforms.html
+# See https://openfisca.org/doc/key-concepts/reforms.html
 
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca

openfisca_country_template/variables/benefits.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *
@@ -20,14 +20,14 @@ class basic_income(Variable):
     # Since Dec 1st 2016, the basic income is provided to any adult, without considering their income.
     def formula_2016_12(person, period, parameters):
         age_condition = person('age', period) >= parameters(period).general.age_of_majority
-        return age_condition * parameters(period).benefits.basic_income  # This '*' is a vectorial 'if'. See https://openfisca.org/doc/coding-the-legislation/30_case_disjunction.html#simple-multiplication
+        return age_condition * parameters(period).benefits.basic_income  # This '*' is a vectorial 'if'. See https://openfisca.org/doc/coding-the-legislation/25_vectorial_computing.html#control-structures
 
     # From Dec 1st 2015 to Nov 30 2016, the basic income is provided to adults who have no income.
     # Before Dec 1st 2015, the basic income does not exist in the law, and calculating it returns its default value, which is 0.
     def formula_2015_12(person, period, parameters):
         age_condition = person('age', period) >= parameters(period).general.age_of_majority
         salary_condition = person('salary', period) == 0
-        return age_condition * salary_condition * parameters(period).benefits.basic_income  # The '*' is also used as a vectorial 'and'. See https://openfisca.org/doc/coding-the-legislation/25_vectorial_computing.html#forbidden-operations-and-alternatives
+        return age_condition * salary_condition * parameters(period).benefits.basic_income  # The '*' is also used as a vectorial 'and'. See https://openfisca.org/doc/coding-the-legislation/25_vectorial_computing.html#boolean-operations
 
 
 class housing_allowance(Variable):

openfisca_country_template/variables/demographics.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *

openfisca_country_template/variables/housing.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *

openfisca_country_template/variables/income.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *

openfisca_country_template/variables/stats.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *

openfisca_country_template/variables/taxes.py

@@ -2,7 +2,7 @@
 
 # This file defines variables for the modelled legislation.
 # A variable is a property of an Entity such as a Person, a Household…
-# See https://openfisca.org/doc/variables.html
+# See https://openfisca.org/doc/key-concepts/variables.html
 
 # Import from openfisca-core the common Python objects used to code the legislation in OpenFisca
 from openfisca_core.model_api import *
@@ -48,7 +48,7 @@ class housing_tax(Variable):
     def formula(household, period, parameters):
         # The housing tax is defined for a year, but depends on the `accommodation_size` and `housing_occupancy_status` on the first month of the year.
         # Here period is a year. We can get the first month of a year with the following shortcut.
-        # To build different periods, see https://openfisca.org/doc/coding-the-legislation/35_periods.html#calculating-dependencies-for-a-specific-period
+        # To build different periods, see https://openfisca.org/doc/coding-the-legislation/35_periods.html#calculate-dependencies-for-a-specific-period
         january = period.first_month
         accommodation_size = household('accommodation_size', january)
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name = "OpenFisca-Country-Template",
-    version = "3.5.3",
+    version = "3.5.4",
     author = "OpenFisca Team",
     author_email = "contact@openfisca.org",
     classifiers=[