Merge pull request #54 from rhattersley/std-name-links

Update URLs for standard name table.

ch03.adoc

@@ -64,7 +64,19 @@ description:: The description is meant to clarify the qualifiers of the fundamen
 
 When appropriate, the table entry also contains the corresponding GRIB parameter code(s) (from ECMWF and NCEP) and AMIP identifiers.
 
-The standard name table is located at link:$$http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/current/cf-standard-name-table.xml$$[http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/current/cf-standard-name-table.xml], written in compliance with the XML format, as described in <<standard-name-table-format>>. Knowledge of the XML format is only necessary for application writers who plan to directly access the table. A formatted text version of the table is provided at link:$$http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/current/standard-name-table$$[http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/current/standard-name-table], and this table may be consulted in order to find the standard name that should be assigned to a variable. Some standard names (e.g. **`region`** and **`area_type`**) are used to indicate quantities which are permitted to take only certain standard values. This is indicated in the definition of the quantity in the standard name table, accompanied by a list or a link to a list of the permitted values.
+The standard name table is located at
+http://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml,
+written in compliance with the XML format, as described in
+<<standard-name-table-format>>. Knowledge of the XML format is only necessary
+for application writers who plan to directly access the table. A formatted text
+version of the table is provided at
+http://cfconventions.org/Data/cf-standard-names/current/build/cf-standard-name-table.html,
+and this table may be consulted in order to find the standard name that should
+be assigned to a variable. Some standard names (e.g. **`region`** and
+**`area_type`**) are used to indicate quantities which are permitted to take
+only certain standard values. This is indicated in the definition of the
+quantity in the standard name table, accompanied by a list or a link to a list
+of the permitted values.
 
 Standard names by themselves are not always sufficient to describe a quantity. For example, a variable may contain data to which spatial or temporal operations have been applied. Or the data may represent an uncertainty in the measurement of a quantity. These quantity attributes are expressed as modifiers of the standard name. Modifications due to common statistical operations are expressed via the **`cell_methods`** attribute (see <<cell-methods>> and <<appendix-cell-methods>>). Other types of quantity modifiers are expressed using the optional modifier part of the **`standard_name`** attribute. The permissible values of these modifiers are given in <<standard-name-modifiers>>.
 

ch06.adoc

@@ -37,7 +37,7 @@ analogous to a numeric scalar coordinate variable (see
 [[geographic-regions, Section 6.1.1, "Geographic Regions"]]
 ==== Geographic Regions
 
-When data is representative of geographic regions which can be identified by names but which have complex boundaries that cannot practically be specified using longitude and latitude boundary coordinates, a labeled axis should be used to identify the regions. We recommend that the names be chosen from the list of link:$$http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standardized-region-names$$[standardized region names] whenever possible. To indicate that the label values are standardized the variable that contains the labels must be given the **`standard_name`** attribute with the value `region`.
+When data is representative of geographic regions which can be identified by names but which have complex boundaries that cannot practically be specified using longitude and latitude boundary coordinates, a labeled axis should be used to identify the regions. We recommend that the names be chosen from the list of link:$$http://cfconventions.org/Data/cf-standard-names/docs/standardized-region-names.html$$[standardized region names] whenever possible. To indicate that the label values are standardized the variable that contains the labels must be given the **`standard_name`** attribute with the value `region`.
 
 [[northward-heat-transport-in-atlantic-ocean-ex]]
 [caption="Example 6.2. "]