This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 8e71e81 HDDS-4166. Documentation index page redirects to the wrong
address (#1372)
8e71e81 is described below
commit 8e71e81dc29e77bb87399e2911e3d6335e794753
Author: Neo Yang <[email protected]>
AuthorDate: Tue Sep 15 16:54:57 2020 +0800
HDDS-4166. Documentation index page redirects to the wrong address (#1372)
---
hadoop-hdds/docs/content/concept/Overview.zh.md | 2 +-
hadoop-hdds/docs/content/interface/O3fs.zh.md | 5 ++---
hadoop-hdds/docs/content/security/SecureOzone.zh.md | 3 +--
hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html | 2 +-
hadoop-hdds/docs/themes/ozonedoc/layouts/partials/languages.html | 3 ++-
hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html | 6 +++---
hadoop-hdds/docs/themes/ozonedoc/layouts/partials/sidebar.html | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/hadoop-hdds/docs/content/concept/Overview.zh.md
b/hadoop-hdds/docs/content/concept/Overview.zh.md
index 042651e..72159bb 100644
--- a/hadoop-hdds/docs/content/concept/Overview.zh.md
+++ b/hadoop-hdds/docs/content/concept/Overview.zh.md
@@ -24,7 +24,7 @@ summary: 介绍 Ozone 的整体和各个组件。
Ozone 是一个分布式、多副本的对象存储系统，并针对大数据场景进行了专门的优化。Ozone 主要围绕可扩展性进行设计，目标是十亿数量级以上的对象存储。
-Ozone 通过对命名空间与块空间的管理进行分离，大大增加了其可扩展性，其中命名空间由 [Ozone Manager ]({{< ref
"OzoneManager.zh.md" >}})（OM）管理，块空间由 [Storage Container Manager] ({{< ref
"StorageContainerManager.zh.md" >}})（SCM）管理。
+Ozone 通过对命名空间与块空间的管理进行分离，大大增加了其可扩展性，其中命名空间由 [Ozone Manager ]({{< ref
"OzoneManager.zh.md" >}})（OM）管理，块空间由 [Storage Container Manager]({{< ref
"StorageContainerManager.zh.md" >}})（SCM）管理。
Ozone 的管理由卷、桶和键组成。卷类似于个人主目录，只有管理员可以创建。
diff --git a/hadoop-hdds/docs/content/interface/O3fs.zh.md
b/hadoop-hdds/docs/content/interface/O3fs.zh.md
index 0b2a06f..4cc8885 100644
--- a/hadoop-hdds/docs/content/interface/O3fs.zh.md
+++ b/hadoop-hdds/docs/content/interface/O3fs.zh.md
@@ -28,8 +28,7 @@ summary: Hadoop 文件系统兼容使得任何使用类 HDFS 接口的应用无
</div>
Hadoop 的文件系统接口兼容可以让任意像 Ozone 这样的存储后端轻松地整合进 Hadoop 生态系统，Ozone 文件系统就是一个兼容 Hadoop
的文件系统。
-目前ozone支持两种协议:
o3fs和ofs。两者最大的区别是o3fs只支持在单个bucket上操作，而ofs则支持跨所有volume和bucket的操作。关于两者在操作
-上的具体区别可以参考ofs.md中的"Differences from existing o3fs"。
+目前ozone支持两种协议:
o3fs和ofs。两者最大的区别是o3fs只支持在单个bucket上操作，而ofs则支持跨所有volume和bucket的操作。关于两者在操作上的具体区别请参考[OFS(英文页面)]({{<
relref path="interface/ofs.md" lang="en" >}})中的"Differences from o3fs"。
## o3fs的配置及使用
@@ -115,7 +114,7 @@ hdfs dfs -ls
o3fs://bucket.volume.om-host.example.com:6789/key
注意：在这种情况下，`ozone.om.address` 配置中只有端口号会被用到，主机名是被忽略的。
## ofs的配置及使用
-这只是一个通用的介绍。了解更详细的用法，可以请参考ofs.md。
+这只是一个通用的介绍。了解更详细的用法，请参考[OFS(英文页面)]({{< relref path="interface/ofs.md"
lang="en" >}})。
请在 core-site.xml 中添加以下条目：
diff --git a/hadoop-hdds/docs/content/security/SecureOzone.zh.md
b/hadoop-hdds/docs/content/security/SecureOzone.zh.md
index 707e3e5..bd4a315 100644
--- a/hadoop-hdds/docs/content/security/SecureOzone.zh.md
+++ b/hadoop-hdds/docs/content/security/SecureOzone.zh.md
@@ -52,8 +52,7 @@ S3 使用了一种不一样的共享秘密的安全机制，Ozone 支持 AWS Sig
S3 token 功能在启用安全机制的情况下也默认开启。
-Ozone 的每个服务进程都需要一个 Kerberos 服务主体名和对应的 [kerberos
keytab](https://web.mit.edu/kerberos/krb5-latest/doc/basic
-/keytab_def.html) 文件。
+Ozone 的每个服务进程都需要一个 Kerberos 服务主体名和对应的 [kerberos
keytab](https://web.mit.edu/kerberos/krb5-latest/doc/basic/keytab_def.html) 文件。
ozone-site.xml 中应进行如下配置：
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
index 7cc8736..208a971 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
@@ -30,7 +30,7 @@
<div class="col-md-9">
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
- <li class="breadcrumb-item"><a href="/">Home</a></li>
+ <li class="breadcrumb-item"><a href="{{ "index.html" |
relLangURL }}">Home</a></li>
<li class="breadcrumb-item" aria-current="page"><a
href="{{.CurrentSection.Permalink}}">{{.CurrentSection.Title}}</a></li>
<li class="breadcrumb-item active" aria-current="page">{{
.Title }}</li>
</ol>
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/languages.html
b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/languages.html
index ef9548c..a437cde 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/languages.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/languages.html
@@ -18,7 +18,8 @@
<div class="pull-right">
{{ range .AllTranslations }}
{{ if ne $.Language .Language}}
- <a href="{{.Permalink}}"><span class="label label-success">{{
.Language.LanguageName }}</span></a>
+ {{ $permalink := cond (strings.HasSuffix .Permalink ".html") .Permalink
(printf "%sindex.html" .Permalink)}}
+ <a href="{{$permalink}}"><span class="label label-success">{{
.Language.LanguageName }}</span></a>
{{end}}
{{ end }}
</div>
\ No newline at end of file
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html
b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html
index 7c36358..155f7ad 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/navbar.html
@@ -23,10 +23,10 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a href="#" class="navbar-left" style="height: 50px; padding: 5px 5px
5px 0;">
- <img src="{{ "ozone-logo-small.png" | relURL }}" width="40"/>
+ <a href="{{ "index.html" | relLangURL }}" class="navbar-left"
style="height: 50px; padding: 5px 10px 5px 0px;">
+ <img src="{{ "ozone-logo-small.png" | relURL }}" style="width: 40px;
padding: 0px;"/>
</a>
- <a class="navbar-brand hidden-xs" href="#">
+ <a class="navbar-brand hidden-xs" href="{{ "index.html" | relLangURL }}">
Apache Hadoop Ozone/HDDS documentation
</a>
<a class="navbar-brand visible-xs-inline" href="#">Hadoop Ozone</a>
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/sidebar.html
b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/sidebar.html
index bb84ee7..c245584 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/sidebar.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/partials/sidebar.html
@@ -48,8 +48,8 @@
</li>
{{ else }}
<li class="{{ if $currentPage.IsMenuCurrent "main" . }}active{{
end }}">
- {{ if eq .URL "/" }}
- <a href="{{ "index.html" | relURL }}">
+ {{ if not (strings.HasSuffix .URL ".html")}}
+ <a href="{{ "index.html" | relLangURL }}">
{{ else }}
<a href="{{ .URL | relURL }}">
{{ end }}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
