You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by zh...@apache.org on 2018/05/10 03:08:38 UTC

[1/3] incubator-singa git commit: SINGA-352 Some fixes in documentation

Repository: incubator-singa
Updated Branches:
  refs/heads/master 0407efbd4 -> b5600d347


SINGA-352 Some fixes in documentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/43c33e96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/43c33e96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/43c33e96

Branch: refs/heads/master
Commit: 43c33e967994faa8f132b4cf21a9654e4d8baf01
Parents: 9696255
Author: Moaz Reyad <mo...@apache.org>
Authored: Tue May 8 00:27:12 2018 +0800
Committer: Moaz Reyad <mo...@apache.org>
Committed: Tue May 8 00:27:12 2018 +0800

----------------------------------------------------------------------
 doc/en/community/team-list.rst    |  2 +-
 doc/en/docs/install_macos1013.rst | 18 ++++++++++++++++++
 doc/zh/community/team-list.rst    |  4 ++--
 doc/zh/index.rst                  |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/43c33e96/doc/en/community/team-list.rst
----------------------------------------------------------------------
diff --git a/doc/en/community/team-list.rst b/doc/en/community/team-list.rst
index db9ed78..72a5101 100644
--- a/doc/en/community/team-list.rst
+++ b/doc/en/community/team-list.rst
@@ -78,7 +78,7 @@ The SINGA community has developers mainly from National University of Singapore,
 +--------------------+--------------------------------+-----------------------------------------------+
 | Kaiping Zheng      | kaiping@apache.org             | National University of Singapore              |
 +--------------------+--------------------------------+-----------------------------------------------+
-| Moaz Reyad         | moazreyad@gmail.com            | National University of Singapore              |
+| Moaz Reyad         | moaz@apache.org                | National University of Singapore              |
 +--------------------+--------------------------------+-----------------------------------------------+
 | Chang Yao          | yaochang2009@gmail.com         | yzBigdata                                     |
 +--------------------+--------------------------------+-----------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/43c33e96/doc/en/docs/install_macos1013.rst
----------------------------------------------------------------------
diff --git a/doc/en/docs/install_macos1013.rst b/doc/en/docs/install_macos1013.rst
index 457b83d..9cc9ad1 100644
--- a/doc/en/docs/install_macos1013.rst
+++ b/doc/en/docs/install_macos1013.rst
@@ -1,3 +1,21 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
 Installing SINGA on macOS 13.10
 ===============================
 

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/43c33e96/doc/zh/community/team-list.rst
----------------------------------------------------------------------
diff --git a/doc/zh/community/team-list.rst b/doc/zh/community/team-list.rst
index a344bbf..71e87fe 100644
--- a/doc/zh/community/team-list.rst
+++ b/doc/zh/community/team-list.rst
@@ -40,7 +40,7 @@ Thejas Nair          thejas@apache.org
 SINGA社区的开发者主要来自新加坡国立大学,浙江大学,网易,大阪大学,yzBigData等.
 
 +--------------------+--------------------------------+-----------------------------------------------+
-| 姓名               | Email                          | 组织		                                  |
+| 姓名               | Email                          | 组织		                          |
 +====================+================================+===============================================+
 | Gang Chen          | cg@zju.edu.cn                  | Zhejiang University                           |
 +--------------------+--------------------------------+-----------------------------------------------+
@@ -78,7 +78,7 @@ SINGA社区的开发者主要来自新加坡国立大学,浙江大学,网易
 +--------------------+--------------------------------+-----------------------------------------------+
 | Kaiping Zheng      | kaiping@apache.org             | National University of Singapore              |
 +--------------------+--------------------------------+-----------------------------------------------+
-| Moaz Reyad         | moazreyad@gmail.com            | National University of Singapore              |
+| Moaz Reyad         | moaz@apache.org                | National University of Singapore              |
 +--------------------+--------------------------------+-----------------------------------------------+
 | Chang Yao          | yaochang2009@gmail.com         | yzBigdata                                     |
 +--------------------+--------------------------------+-----------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/43c33e96/doc/zh/index.rst
----------------------------------------------------------------------
diff --git a/doc/zh/index.rst b/doc/zh/index.rst
index 6c12380..46cfe5a 100644
--- a/doc/zh/index.rst
+++ b/doc/zh/index.rst
@@ -145,6 +145,6 @@ SINGA 入门
 SINGA 在 `Apache License Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_ 许可证下发布.
 
 免责声明(英文)
------------
+--------------------
 
 Apache SINGA is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.


[2/3] incubator-singa git commit: SINGA-352 Hide past releases by default

Posted by zh...@apache.org.
SINGA-352 Hide past releases by default


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/9281cc41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/9281cc41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/9281cc41

Branch: refs/heads/master
Commit: 9281cc410cf82ddcb700c620d828cddd55b627ee
Parents: 43c33e9
Author: Moaz Reyad <mo...@gmail.com>
Authored: Wed May 9 12:59:43 2018 +0800
Committer: Moaz Reyad <mo...@gmail.com>
Committed: Wed May 9 12:59:43 2018 +0800

----------------------------------------------------------------------
 doc/_templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9281cc41/doc/_templates/layout.html
----------------------------------------------------------------------
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 1b07f5b..25a27f9 100755
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -23,7 +23,7 @@
 
 {% block footer %}
 
-<div class="rst-versions shift-up" data-toggle="rst-versions" role="note" aria-label="versions">
+<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
   <span class="rst-current-version" data-toggle="rst-current-version">
     <span class="fa fa-book"> incubator-singa </span>
     v: {{ version }}


[3/3] incubator-singa git commit: Merge branch 'SINGA-352'

Posted by zh...@apache.org.
Merge branch 'SINGA-352'


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/b5600d34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/b5600d34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/b5600d34

Branch: refs/heads/master
Commit: b5600d347cd1b08f223ac8fa22f90f47b3a8911b
Parents: 0407efb 9281cc4
Author: zhaojing <zh...@comp.nus.edu.sg>
Authored: Thu May 10 11:07:29 2018 +0800
Committer: zhaojing <zh...@comp.nus.edu.sg>
Committed: Thu May 10 11:07:29 2018 +0800

----------------------------------------------------------------------
 doc/_templates/layout.html     | 2 +-
 doc/en/community/team-list.rst | 2 +-
 doc/zh/community/team-list.rst | 4 ++--
 doc/zh/index.rst               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------