Call them 2i2c managed JupyterHubs rather than hubs

2i2c-org/infrastructure#314 talks
about the need to be very explicit in what we call the
service we provide. The word 'hub' is very overloaded.

2i2c managed infrastructure has an important property that our naming
should reflect.  It isn't a *new thing* we are developing, but a
deployment of an upstream, purely open source product. This means
our users can always:

1. Take their infrastructure from 2i2c, and run it themselves
   with help from the community.
2. Work with us to *train* their own staff to run their JupyterHub,
   so they can participate fully in running the infrastructure. This
   gives them organizational control over what is built, and they
   can walk away easier if needed.
3. Any improvements we make in terms of features built or
   operations smoothed will be made in upstream repositories, and

I think directly using the word JupyterHub is a good way to
communicate this.

Alternative suggestions:

1. just 'JupyterHub'
2. 2i2c JupyterHub
3. JupyterHub managed by 2i2c

I prefer (2) if needed.

Question is, how does this related to the Jupyter Trademark
policy (https://jupyter.org/governance/trademarks.html)?
Particularly:

> Any commercial use of the Jupyter trademarks in product or company
> names must be approved first by Project Jupyter. Some uses, like calling
> a company “The Jupyter Company,” or a product “Jupyter Hosting” or
> “Jupyter Cloud” will be refused. This is because they are overly broad,
> or confusing as to whether Jupyter is open source or commercial, or
> whether your product or organization is affiliated with or sponsored by
> Project Jupyter.

(from
https://jupyter.org/governance/trademarks.html#uses-that-always-require-approval)

So no matter what, I think this needs to go to the Jupyter steering
council. I personally believe that '2i2c managed JupyterHub' is fine,
but that's not for me to decide.

config/_default/menus.toml

@@ -4,7 +4,7 @@
 #   The weight parameter defines the order that the links will appear in.
 
 [[main]]
-  name = "2i2c Hubs"
+  name = "2i2c managed JupyterHubs"
   url = "infrastructure/"
   weight = 10
 

content/home/contact.md

@@ -18,6 +18,6 @@ autolink = false
 email_form = 0
 +++
 
-If you've got a question about 2i2c or would like to inquire about hosted 2i2c Hubs, [send us an email <i class="fas fa-envelope"></i>](mailto:[email protected]). If you'd like to be updated as 2i2c grows and evolves, fill out the form below.
+If you've got a question about 2i2c or would like to inquire about 2i2c managed JupyterHubs, [send us an email <i class="fas fa-envelope"></i>](mailto:[email protected]). If you'd like to be updated as 2i2c grows and evolves, fill out the form below.
 
 <iframe src="https://docs.google.com/forms/d/e/1FAIpQLSdW_bhVrXfgRYa9Ct6w399KQPILbU_3nKUF_tgnGZJbs91SXg/viewform?embedded=true" width="640" height="1000" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>

content/home/hero.md

@@ -38,7 +38,7 @@ hero_media = "2i2c-hub-overview.png"
 #   Remove a link/note by deleting a cta/note block.
 [cta]
   url = "infrastructure"
-  label = "What's a 2i2c Hub?"
+  label = "What's a 2i2c managed JupyterHub?"
   # icon_pack = "fas"
   # icon = "envelope"
 

content/home/mission.md

@@ -17,7 +17,7 @@ title = "What we do"
         <div class="card-body text-center">
             <h5 class="card-title">Manage interactive computing infrastructure for research and education</h5>
             <p class="card-text">
-            2i2c provides managed hubs for data science in research and engineering communities. They are tailored for the communities they serve and 💯 open source.
+            2i2c provides managed JupyterHubs for data science in research and engineering communities. They are tailored for the communities they serve and 💯 open source.
             </p>
         </div>
         <div class="card-footer text-center">

content/infrastructure/2i2c-hub-overview.md

@@ -3,11 +3,11 @@ weight = 25
 [design]
   columns = "1"
 +++
-# What is in a 2i2c Hub?
+# What is in a 2i2c managed JupyterHub?
 
 A 2i2c Hub is a collection of open source tools that provide interactive computing environments in the cloud. JupyterHub is the lynch-pin that ties everything together. It handles user accounts, provides the interactive environment, and connects users with computational and data resources.
 
-Every 2i2c Hub is tailored for the community that uses it. 2i2c Hubs can run on almost
+Every 2i2c managed JupyterHub is tailored for the community that uses it. 2i2c managed JupyterHubs can run on almost
 any kind of cloud infrastructure (or even your own local hardware), provide a
 customizable environment for your needs, and they are built with 100% open source and
 community-driven software.
@@ -16,4 +16,4 @@ community-driven software.
 infrastructure. This means being able to replicate your entire cloud deployment with or
 without 2i2c.
 
-For more information about the 2i2c Hubs, see [the 2i2c Hubs Pilot documentation](https://2i2c.org/pilot/infrastructure.html).
+For more information about the 2i2c managed JupyterHubs, see [the 2i2c managed JupyterHubs Pilot documentation](https://2i2c.org/pilot/infrastructure.html).

content/infrastructure/features.md

@@ -12,13 +12,13 @@ weight = 10
   icon = "boxes"
   icon_pack = "fas"
   name = "An environment for your community"
-  description = "2i2c Hubs provide data environments that have been designed for research and education, and can be customized for your community."
+  description = "2i2c managed JupyterHubs provide data environments that have been designed for research and education, and can be customized for your community."
 
 [[feature]]
   icon = "desktop"
   icon_pack = "fas"
   name = "Provide a variety of open source interfaces"
-  description = "Use a variety of user interfaces, including Jupyter Notebook, Jupyter Lab, RStudio, VSCode. If it can be run in a browser, it can run on a 2i2c Hub."
+  description = "Use a variety of user interfaces, including Jupyter Notebook, Jupyter Lab, RStudio, VSCode. If it can be run in a browser, it can run on a 2i2c managed JupyterHub."
 
 [[feature]]
   icon = "book"
@@ -30,7 +30,7 @@ weight = 10
   icon = "tachometer-alt"
   icon_pack = "fas"
   name = "Provide access to scalable computing"
-  description = "2i2c Hubs can provide tools for high-performance data analysis, along with cloud resources to scale your computation."
+  description = "2i2c managed JupyterHubs can provide tools for high-performance data analysis, along with cloud resources to scale your computation."
 
 [[feature]]
   icon = "project-diagram"
@@ -42,5 +42,5 @@ weight = 10
   icon = "handshake"
   icon_pack = "fas"
   name = "Built by the community, for the community"
-  description = "2i2c Hubs are entirely built on open-source infrastructure. No vendor  lock-in, no proprietary tools. You have the [right to replicate your infrastructure](/right-to-replicate) with or without 2i2c."
+  description = "2i2c managed JupyterHubs are entirely built on open-source infrastructure. No vendor  lock-in, no proprietary tools. You have the [right to replicate your infrastructure](/right-to-replicate) with or without 2i2c."
 +++

content/infrastructure/index.md

@@ -2,5 +2,5 @@
 # Homepage
 type = "widget_page"
 headless = false  # Homepage is headless, other widget pages are not.
-title = "2i2c Hubs"
+title = "2i2c managed JupyterHubs"
 +++

content/infrastructure/intro.md

@@ -3,7 +3,7 @@
 type = "blank"
 headless = true  # Homepage is headless, other widget pages are not.
 weight = 1
-title = "The 2i2c Hubs"
+title = "The 2i2c managed JupyterHubs"
 
 [design]
   columns = "1"

content/infrastructure/kinds-of-hubs.md

@@ -6,17 +6,17 @@ weight = 30
 
 # Kinds of hubs
 
-2i2c Hubs are extremely flexible and customizable, and can generally meet most use-cases in research and education. That said, the complexity of a hub will impact how much work it takes to both deploy and maintain.
+2i2c managed JupyterHubs are extremely flexible and customizable, and can generally meet most use-cases in research and education. That said, the complexity of a hub will impact how much work it takes to both deploy and maintain.
 
 2i2c broadly has two kinds of hubs that it offers for other communities.
 
-## Self-serve 2i2c hubs
+## Self-serve 2i2c managed JupyterHubs
 
 These hubs provide a base environment with reasonable defaults, and are relatively easy to setup and configure for a straightforward use-case. They are ideal for use-cases where there are not very complex environment, computing, or data needs for a community. They are a great choice for getting familiar with using JupyterHub infrastructure in the cloud, as well as for doing working with a use-case that is very common, such as data science education. They are meant to serve a large collection of communities.
 
 The 2i2c [Hubs for All pilot](https://2i2c.org/pilot) is an example of these hubs in action.
 
-## Bespoke 2i2c hubs
+## Bespoke 2i2c managed JupyterHubs
 
 These hubs are hand-tailored for your community. They start with a basic JupyterHub setup, and 2i2c will work with you to hand-craft the infrastructure, environment, etc to your needs. These are best-suited for larger or more diverse communities with more complex needs in their hub environment. For example, if you require access to authenticated data source in the cloud, scalable computing, or if you require your infrastructure to run on a particular vendor's infrastructure.