Merge branch 'master' into 14345-add-webdav-user-doc

refs #14345

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --combined doc/_config.yml
index fad4e0763f8cc74ec0e1a4090d9f3511b7836145,6acba2bc065d90b7e1d5f3791985c3b958741ad7..94c95399662057d9f40d6733d9504419e8e2ed7f
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -34,11 -34,9 +34,11 @@@ navbar
      - Working with data sets:
        - user/tutorials/tutorial-keep.html.textile.liquid
        - user/tutorials/tutorial-keep-get.html.textile.liquid
 -      - user/tutorials/tutorial-keep-collection-lifecycle.html.textile.liquid
 -      - user/tutorials/tutorial-keep-mount.html.textile.liquid
 +      - user/tutorials/tutorial-keep-mount-gnu-linux.html.textile.liquid
 +      - user/tutorials/tutorial-keep-mount-os-x.html.textile.liquid
 +      - user/tutorials/tutorial-keep-mount-windows.html.textile.liquid
        - user/topics/keep.html.textile.liquid
 +      - user/tutorials/tutorial-keep-collection-lifecycle.html.textile.liquid
        - user/topics/arv-copy.html.textile.liquid
        - user/topics/storage-classes.html.textile.liquid
        - user/topics/collection-versioning.html.textile.liquid
@@@ -51,6 -49,7 +51,7 @@@
      - Develop an Arvados workflow:
        - user/tutorials/intro-crunch.html.textile.liquid
        - user/tutorials/writing-cwl-workflow.html.textile.liquid
+       - user/cwl/federated-workflows.html.textile.liquid
        - user/cwl/cwl-style.html.textile.liquid
        - user/cwl/cwl-extensions.html.textile.liquid
        - user/topics/arv-docker.html.textile.liquid