Merge pull request #4129 from StefanoChiodino/master

Document that readthedocs file can now have yaml extension

Author: humitos

docs/conda.rst

@@ -15,7 +15,8 @@ Activating Conda
 ----------------
 
 Conda Support is the first feature enabled with :doc:`yaml-config`.
-You can enable it by creating a `readthedocs.yml` file in the root of your repository with the contents:
+You can enable it by creating a `readthedocs.yml` file in the root of your
+repository with the contents:
 
 .. code-block:: yaml
 

docs/design/yaml-file.rst

@@ -86,8 +86,10 @@ The file format is based on the YAML spec 1.2 [#yaml-spec]_
 
 The file must be on the root directory of the repository, and must be named as:
 
-- ``.readthedocs.yml``
 - ``readthedocs.yml``
+- ``readthedocs.yaml``
+- ``.readthedocs.yml``
+- ``.readthedocs.yaml``
 
 Conventions
 ~~~~~~~~~~~

docs/yaml-config.rst

@@ -2,7 +2,7 @@ Read the Docs YAML Config
 =========================
 
 Read the Docs now has support for configuring builds with a YAML file.
-The file, ``readthedocs.yml`` (or ``.readthedocs.yml``), must be in the root directory of your project.
+The file, ``readthedocs.yml``, must be in the root directory of your project.
 
 .. warning:: This feature is in a beta state.
              Please file an `issue`_ if you find anything wrong.