From 03773e1fba055036c1bd87c03192d8d32fc803bd Mon Sep 17 00:00:00 2001
From: congfairy <congfairy@users.noreply.github.com>
Date: Sun, 25 Nov 2018 12:28:08 +0800
Subject: [PATCH] zh_trans:upstream.md (#11169)

* zh_trans:upstream.md

* Update upstream.md
---
 .../zh/docs/reference/glossary/upstream.md    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 content/zh/docs/reference/glossary/upstream.md

diff --git a/content/zh/docs/reference/glossary/upstream.md b/content/zh/docs/reference/glossary/upstream.md
new file mode 100644
index 0000000000..7f2c7ded3e
--- /dev/null
+++ b/content/zh/docs/reference/glossary/upstream.md
@@ -0,0 +1,27 @@
+---
+title: Upstream (disambiguation)
+id: upstream
+date: 2018-04-12
+full_link: 
+short_description: >
+  May refer to: core Kubernetes or the source repo from which a repo was forked.
+
+aka: 
+tags:
+- community
+---
+<!--
+ May refer to: core Kubernetes or the source repo from which a repo was forked.
+-->
+<!--more--> 
+<!--
+* In the **Kubernetes Community**: Conversations often use *upstream* to mean the core Kubernetes codebase, which the general ecosystem, other code, or third-party tools relies upon. For example, [community members](#term-member) may suggest that a feature is moved upstream so that it is in the core codebase instead of in a plugin or third-party tool.
+* In **GitHub** or **git**: The convention is to refer to a source repo as *upstream*, whereas the forked repo is considered *downstream*.
+-->
+
+可以参考：核心 Kubernetes 仓库或作为当前仓库派生来源的来源仓库。
+
+<!-- 更多 -->
+
+* 在 **Kubernetes社区**：对话中通常使用 *upstream* 来表示核心 Kubernetes 代码库，也就是更广泛的 kubernetes 生态系统、其他代码或第三方工具所依赖的仓库。 例如，[社区成员](#term-member)可能会建议将某个功能特性贡献到 upstream，使其位于核心代码库中，而不是维护于插件或第三方工具中。
+* 在 **GitHub** 或 **git** 中：约定是将源仓库称为 *upstream*，而派生的仓库则被视为 *downstream*。