You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2016/11/04 03:05:02 UTC
[trafficserver] branch 6.2.x updated (ba12827 -> 73a09e2)
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a change to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from ba12827 TS-4957: Make the use of madvise() with MADV_DONTDUMP configurable.
new 3dbec5c TS-4466: Add links to other versions of the documentation
new 4d7564b TS-4466: Specify language explicitly
new 73a09e2 TS-4466: Improve a layout and behavior of the switcher
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/jenkins/bin/{rat.sh => docs.sh} | 25 +++++++++++++++--------
doc/_templates/layout.html | 41 ++++++++++++++++++++++++++++++++++++++
doc/static/override.css | 5 +++++
3 files changed, 63 insertions(+), 8 deletions(-)
copy ci/jenkins/bin/{rat.sh => docs.sh} (53%)
mode change 100755 => 100644
create mode 100644 doc/_templates/layout.html
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 03/03: TS-4466: Improve a layout and behavior of
the switcher
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 73a09e244c0c2c02a751f158a28961b652a2d17d
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue May 24 16:16:38 2016 +0900
TS-4466: Improve a layout and behavior of the switcher
(cherry picked from commit ca35a0528b83c74ed7aa2f05cb73041648505b86)
---
doc/_templates/layout.html | 2 +-
doc/static/override.css | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index b4afcb7..3033ee8 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -17,7 +17,7 @@
#}
{% extends "!layout.html" %}
{% 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"> Apache Traffic Server</span>
v: {{ version }}
diff --git a/doc/static/override.css b/doc/static/override.css
index 1ab1e71..b7940a3 100644
--- a/doc/static/override.css
+++ b/doc/static/override.css
@@ -23,3 +23,8 @@ dd {
span.pre {
line-height: initial;
}
+
+/* Fix for nav bottom padding with flyout */
+nav.wy-nav-side {
+ padding-bottom: 3em;
+}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/03: TS-4466: Add links to other versions of the
documentation
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 3dbec5c0ffa9b26b813e3a6008b2f3c211398456
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Sat May 21 17:31:33 2016 +0900
TS-4466: Add links to other versions of the documentation
(cherry picked from commit 70a23a925be4800efbd24d82217e6d22084f2e14)
---
doc/_templates/layout.html | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
new file mode 100644
index 0000000..b4afcb7
--- /dev/null
+++ b/doc/_templates/layout.html
@@ -0,0 +1,41 @@
+{#
+ 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.
+#}
+{% extends "!layout.html" %}
+{% block footer %}
+<div class="rst-versions shift-up" data-toggle="rst-versions" role="note" aria-label="versions">
+ <span class="rst-current-version" data-toggle="rst-current-version">
+ <span class="fa fa-book"> Apache Traffic Server</span>
+ v: {{ version }}
+ <span class="fa fa-caret-down"></span>
+ </span>
+ <div class="rst-other-versions">
+ <dl>
+ <dt>Languages</dt>
+ <dd><a href="/en/latest/">English</a></dd>
+ <dd><a href="/ja/latest/">\u65e5\u672c\u8a9e</a></dd>
+ </dl>
+ <dl>
+ <dt>Versions</dt>
+ <dd><a href="/{{ language }}/latest/">latest</a></dd>
+ <dd><a href="/{{ language }}/6.2.x/">6.2.x</a></dd>
+ <dd><a href="/{{ language }}/5.3.x/">5.3.x</a></dd>
+ </dl>
+ </div>
+</div>
+{{ super() }}
+{% endblock %}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/03: TS-4466: Specify language explicitly
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 4d7564b5183fbe52b7a365ec6b37379dea68d9fe
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Sat May 21 17:46:48 2016 +0900
TS-4466: Specify language explicitly
(cherry picked from commit 59fb3d33391bc4f9adc0417099ea96cddac88cba)
Conflicts:
ci/jenkins/bin/docs.sh
---
ci/jenkins/bin/docs.sh | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/ci/jenkins/bin/docs.sh b/ci/jenkins/bin/docs.sh
new file mode 100644
index 0000000..6754040
--- /dev/null
+++ b/ci/jenkins/bin/docs.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# 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.
+
+# These shenanigans are here to allow it to run both manually, and via Jenkins
+test -z "${ATS_MAKE}" && ATS_MAKE="make"
+test ! -z "${WORKSPACE}" && cd "${WORKSPACE}/src"
+
+# This avoids redoing the configure on every doc build, which is somewhat annoying
+[ ! -f configure ] && autoreconf -fi
+[ ! -f config.nice ] && ./configure
+
+cd doc
+
+echo "Building English version"
+rm -rf docbuild/html
+${ATS_MAKE} -e SPHINXOPTS="-D language='en'" html
+[ $? != 0 ] && exit 1
+/usr/bin/rsync --delete -av docbuild/html/ /home/docs/en/${ATS_BRANCH}
+
+echo "Building JA version"
+rm -rf docbuild/html
+${ATS_MAKE} -e SPHINXOPTS="-D language='ja'" html
+[ $? != 0 ] && exit 1
+/usr/bin/rsync --delete -av docbuild/html/ /home/docs/ja/${ATS_BRANCH}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.