From 86978981010a4cc6ab2bbc1a807ef60f6ea0d0d7 Mon Sep 17 00:00:00 2001
From: Min Si <msi@anl.gov>
Date: Mon, 17 Feb 2020 15:35:59 -0600
Subject: [PATCH] section/collectives: replace default team with world team

---
 content/collective_intro.tex  | 10 +++++-----
 content/shmem_barrier_all.tex |  4 ++--
 content/shmem_sync_all.tex    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/collective_intro.tex b/content/collective_intro.tex
index e4495c684..9fa63c81a 100644
--- a/content/collective_intro.tex
+++ b/content/collective_intro.tex
@@ -14,7 +14,7 @@
 \end{DeprecateBlock}
 
 \item Collective routines that accept neither team nor active set
-  parameters, which implicitly operate on the default team and, as
+  parameters, which implicitly operate on the world team and, as
   required, the default context.
 \end{enumerate}
 
@@ -123,14 +123,14 @@ \subsubsection*{Active-set-based collectives}
 \subsubsection*{Team-implicit collectives}
 
 The \FUNC{shmem\_sync\_all} routine synchronizes all \acp{PE} in the
-computation through the default team. This routine is equivalent to a
-call to \FUNC{shmem\_team\_sync} on the default team.
+computation through the world team. This routine is equivalent to a
+call to \FUNC{shmem\_team\_sync} on the world team.
 
 The \FUNC{shmem\_barrier\_all} routine synchronizes all \acp{PE} in
-the default team and ensures completion of all local and remote memory
+the world team and ensures completion of all local and remote memory
 updates issued via the default context.  This routine is equivalent to
 a call to \FUNC{shmem\_ctx\_quiet} on the default context followed by a
-call to \FUNC{shmem\_team\_sync} on the default team.
+call to \FUNC{shmem\_team\_sync} on the world team.
 
 \subsubsection*{Error codes returned from collectives}
 
diff --git a/content/shmem_barrier_all.tex b/content/shmem_barrier_all.tex
index 45e698ca6..4f2675bb5 100644
--- a/content/shmem_barrier_all.tex
+++ b/content/shmem_barrier_all.tex
@@ -18,7 +18,7 @@
 
 \apidescription{   
     The \FUNC{shmem\_barrier\_all} routine
-    is a mechanism for synchronizing all \acp{PE} in the default team at
+    is a mechanism for synchronizing all \acp{PE} in the world team at
     once. This routine blocks the calling \ac{PE} until all \acp{PE} have called
     \FUNC{shmem\_barrier\_all}. In a multithreaded \openshmem
     program, only the calling thread is blocked, however,
@@ -39,7 +39,7 @@
 \apinotes{
     The \FUNC{shmem\_barrier\_all} routine is equivalent to calling
     \FUNC{shmem\_ctx\_quiet} on the default context followed by
-    calling \FUNC{shmem\_team\_sync} on the default team.
+    calling \FUNC{shmem\_team\_sync} on the world team.
 
     The \FUNC{shmem\_barrier\_all} routine can be used to
     portably ensure that memory access operations observe remote updates in the order
diff --git a/content/shmem_sync_all.tex b/content/shmem_sync_all.tex
index 5c70a966e..12bad423a 100644
--- a/content/shmem_sync_all.tex
+++ b/content/shmem_sync_all.tex
@@ -1,6 +1,6 @@
 \apisummary{
     Registers the arrival of a \ac{PE} at a synchronization point and suspends
-    execution until all other \acp{PE} in the default team arrive at a synchronization point. For multithreaded programs, execution is suspended
+    execution until all other \acp{PE} in the world team arrive at a synchronization point. For multithreaded programs, execution is suspended
     as specified by the threading model (Section \ref{subsec:thread_support}).
 }
 
@@ -19,7 +19,7 @@
 \apidescription{
 
     This routine blocks the calling \ac{PE} until all \acp{PE} in the
-    default team have called \FUNC{shmem\_sync\_all}.
+    world team have called \FUNC{shmem\_sync\_all}.
 
     In a multithreaded \openshmem program, only the calling thread is
     blocked.
@@ -36,7 +36,7 @@
 
 \apinotes{
     The \FUNC{shmem\_sync\_all} routine is equivalent to calling
-    \FUNC{shmem\_team\_sync} on the default team.
+    \FUNC{shmem\_team\_sync} on the world team.
 }
 
 \end{apidefinition}