merge from master

rscohn2 · rscohn2 · commit 2f1854787ddc · 2020-02-04T15:05:22.000-05:00
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -18,8 +18,8 @@ standard bodies, including The Khronos Group under their respective
 submission policies.
 
 Contribute to the oneAPI Specification by opening issues in the oneAPI
-Specification `GitHub repository`_ or providing feedback in any other
-oneAPI Specification forum.
+Specification `GitHub repository
+<https://github.com/oneapi-src/oneapi-spec>`__.
 
 
 ------------------
@@ -54,20 +54,8 @@ If you agree to the above, every contribution of your feedback
 must include the following line using your real name and email 
 address: Signed-off-by: Joe Smith joe.smith@email.com
 
--------
-Testing
--------
-
-Before submitting a pull request, very that the document builds
-correctly by running::
-
-  make public
-
-Inspect the areas that you changed to verify it formats correctly.
-
+-----
 Style
 -----
 
 See the `Style Guide <style-guide.rst>`_.
-
-.. _`GitHub repository`: https://github.com/oneapispec/spec
diff --git a/README.rst b/README.rst
@@ -132,15 +132,15 @@ We are currently using gitlab CI inside the intel firewall. See
 have been externally published, we will move it to public CI
 infrastructure.
 
-On every commit, the CI system builds and publishes the document to a
+On every commit, the CI system builds and publishes the document to
 http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/ci/branches
 with a different directory for the latest build of every branch.
 
 For commits to the publish branch, the document is staged at:
-http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/prod/versions. with
+http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/site/versions. with
 a different directory for every version. The version is obtained from
 source/conf/common_conf.py. There is a redirect from:
-http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/prod/index.html
+http://staging.spec.oneapi.com.s3-website-us-west-2.amazonaws.com/site/
 to the latest version.
 
 To push to S3, the CI system configuration sets AWS_ACCESS_KEY_ID and
diff --git a/site-root/oneAPI/index.html b/site-root/oneAPI/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <title>oneAPI</title>
+      <meta http-equiv = "refresh" content = "0; url = ../versions/latest/index.html" />
+   </head>
+   <body>
+   </body>
+</html>
diff --git a/source/conf/common_conf.py b/source/conf/common_conf.py
@@ -8,7 +8,6 @@
 .. |mkl_full_name| replace:: oneAPI Math Kernel Library
 .. |tbb_full_name| replace:: oneAPI Threading Building Blocks
 .. |vpl_full_name| replace:: oneAPI Video Processing Library
-.. |github_prefix| replace:: https://github.com/oneapi-src/oneapi-spec
 """
 
 oneapi_spec_version = '0.6.0'
diff --git a/source/introduction.rst b/source/introduction.rst
@@ -100,8 +100,8 @@ standard bodies, including The Khronos Group under their respective
 submission policies.
 
 Contribute to the oneAPI Specification by opening issues in the oneAPI
-Specification `GitHub repository`_ or providing feedback in any other
-oneAPI Specification forum.
+Specification `GitHub repository
+<https://github.com/oneapi-src/oneapi-spec>`__.
 
 Sign your work
 ++++++++++++++
@@ -144,5 +144,3 @@ Initial public release
 
 .. [*]: Other names and brands may be claimed as the property of others.
 .. _`RFC 2119`: https://tools.ietf.org/html/rfc2119
-.. _`GitHub repository`: |github_prefix|
-
