This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 8706accf Adjust some phrases about Apache, ASF + "feather" (#281)
8706accf is described below
commit 8706accfc7fe67855004efcb554a2f81bb0e4943
Author: Robert Stupp <[email protected]>
AuthorDate: Thu Nov 20 18:53:24 2025 +0100
Adjust some phrases about Apache, ASF + "feather" (#281)
* Replaces the phrase "Apache Home" with "Apache Software Foundation" in
`<img title`.
* Replaces the phrase "Apache feather logo", and similar, with "ASF logo"
in `<img alt`.
* Removes the phrase "multicolor feather" in footers ("Apache®, the names
of Apache projects, and the multicolor feather logo are..." -> "Apache®, the
names of Apache projects, and the logo are").
* Adjust the trademarks phrase in `www/project/icla/views/app.html.rb`.
---
lib/whimsy/asf/themes.rb | 4 ++--
www/401.html | 4 ++--
www/404.html | 4 ++--
www/500.html | 4 ++--
www/503.html | 4 ++--
www/index.html | 4 ++--
www/project/icla/views/app.html.rb | 5 +++--
www/public/HEADER.html | 2 +-
8 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/lib/whimsy/asf/themes.rb b/lib/whimsy/asf/themes.rb
index bfcfe360..efc7caef 100644
--- a/lib/whimsy/asf/themes.rb
+++ b/lib/whimsy/asf/themes.rb
@@ -26,7 +26,7 @@ class Wunderbar::HtmlMarkup
_ ' | '
_a 'Privacy Policy', href:
'https://www.apache.org/foundation/policies/privacy.html'
_br
- _{"Apache\u00AE, the names of Apache projects, and the multicolor
feather logo are "}
+ _{"Apache\u00AE, the names of Apache projects, and the logo are "}
_a 'registered trademarks or trademarks', href:
'https://www.apache.org/foundation/marks/list/'
_ ' of the Apache Software Foundation in the United States and/or
other countries.'
end
@@ -99,7 +99,7 @@ class Wunderbar::HtmlMarkup
_ul.nav.navbar_nav.navbar_right do
_li.dropdown do
_a.dropdown_toggle href: '#', data_toggle: 'dropdown', role:
'button', aria_haspopup: 'true', aria_expanded: 'false' do
- _img title: 'Apache Home', alt: 'Apache feather logo', src:
'https://www.apache.org/img/feather_glyph_notm.png', height: 30
+ _img title: 'The Apache Software Foundation', alt: 'ASF logo',
src: 'https://www.apache.org/img/feather_glyph_notm.png', height: 30
_ ' Apache'
_span.caret
end
diff --git a/www/401.html b/www/401.html
index b6af2884..1092a2a2 100644
--- a/www/401.html
+++ b/www/401.html
@@ -37,7 +37,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false">
- <img title="Apache Home" alt="Apache feather logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
+ <img title="The Apache Software Foundation" alt="ASF logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
Apache
<span class="caret"></span>
</a>
@@ -125,7 +125,7 @@
|
<a
href="https://www.apache.org/foundation/policies/privacy.html";>Privacy
Policy</a>
<br/>
- Apache®, the names of Apache projects, and the multicolor feather logo
are
+ Apache®, the names of Apache projects, and the logo are
<a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a>
of the Apache Software Foundation in the United States and/or other
countries.
</p>
diff --git a/www/404.html b/www/404.html
index a12221ed..5c8462df 100644
--- a/www/404.html
+++ b/www/404.html
@@ -37,7 +37,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false">
- <img title="Apache Home" alt="Apache feather logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
+ <img title="The Apache Software Foundation" alt="ASF logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
Apache
<span class="caret"></span>
</a>
@@ -111,7 +111,7 @@
|
<a
href="https://www.apache.org/foundation/policies/privacy.html";>Privacy
Policy</a>
<br/>
- Apache®, the names of Apache projects, and the multicolor feather logo
are
+ Apache®, the names of Apache projects, and the logo are
<a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a>
of the Apache Software Foundation in the United States and/or other
countries.
</p>
diff --git a/www/500.html b/www/500.html
index 5683de12..6d9ffe28 100644
--- a/www/500.html
+++ b/www/500.html
@@ -37,7 +37,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false">
- <img title="Apache Home" alt="Apache feather logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
+ <img title="The Apache Software Foundation" alt="ASF logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
Apache
<span class="caret"></span>
</a>
@@ -118,7 +118,7 @@
|
<a
href="https://www.apache.org/foundation/policies/privacy.html";>Privacy
Policy</a>
<br/>
- Apache®, the names of Apache projects, and the multicolor feather logo
are
+ Apache®, the names of Apache projects, and the logo are
<a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a>
of the Apache Software Foundation in the United States and/or other
countries.
</p>
diff --git a/www/503.html b/www/503.html
index 2838b0a4..c3111c79 100644
--- a/www/503.html
+++ b/www/503.html
@@ -37,7 +37,7 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown"
role="button" aria-haspopup="true" aria-expanded="false">
- <img title="Apache Home" alt="Apache feather logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
+ <img title="The Apache Software Foundation" alt="ASF logo"
src="https://www.apache.org/img/feather_glyph_notm.png"; height="30"/>
Apache
<span class="caret"></span>
</a>
@@ -118,7 +118,7 @@
|
<a
href="https://www.apache.org/foundation/policies/privacy.html";>Privacy
Policy</a>
<br/>
- Apache®, the names of Apache projects, and the multicolor feather logo
are
+ Apache®, the names of Apache projects, and the logo are
<a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a>
of the Apache Software Foundation in the United States and/or other
countries.
</p>
diff --git a/www/index.html b/www/index.html
index 47c82f12..bcece0d7 100644
--- a/www/index.html
+++ b/www/index.html
@@ -46,7 +46,7 @@
<div class="row">
<div class="col-sm-4 hidden-xs">
<a href="https://www.apache.org/";>
- <img title="The Apache Software Foundation" alt="ASF Logo"
style="margin-left: 10px; margin-top: 10px;"
src="https://www.apache.org/foundation/press/kit/asf_logo_small.png"/>
+ <img title="The Apache Software Foundation" alt="ASF logo"
style="margin-left: 10px; margin-top: 10px;"
src="https://www.apache.org/foundation/press/kit/asf_logo_small.png"/>
</a>
</div>
<div class="col-sm-3 col-xs-3">
@@ -234,7 +234,7 @@
|
<a
href="https://www.apache.org/foundation/policies/privacy.html";>Privacy
Policy</a>
<br />
- Apache®, the names of Apache projects, and the feather logo are
either <a href="https://www.apache.org/foundation/marks/list/";>registered
trademarks or trademarks</a> of The Apache Software Foundation in the United
States and/or other countries.
+ Apache®, the names of Apache projects, and the logo are either
<a href="https://www.apache.org/foundation/marks/list/";>registered trademarks
or trademarks</a> of The Apache Software Foundation in the United States and/or
other countries.
</p>
</div>
</div>
diff --git a/www/project/icla/views/app.html.rb
b/www/project/icla/views/app.html.rb
index 7fff6342..baccb5ce 100755
--- a/www/project/icla/views/app.html.rb
+++ b/www/project/icla/views/app.html.rb
@@ -361,8 +361,9 @@ _html lang: 'en', _width: '80' do
_ '.'
end
- _p.text_center 'Apache and the Apache feather logo are ' +
- 'trademarks of The Apache Software Foundation.'
+ _p.text_center 'Apache®, the names of Apache projects, and the
logo are ' +
+ 'either registered trademarks or trademarks of The Apache
Software Foundation ' +
+ 'in the United States and/or other countries.'
end
end
end
diff --git a/www/public/HEADER.html b/www/public/HEADER.html
index 4a58e74f..07a3882c 100644
--- a/www/public/HEADER.html
+++ b/www/public/HEADER.html
@@ -1,2 +1,2 @@
-<a href="http://www.apache.org/";><img alt="The Apache Software Foundation"
src="https://www.apache.org/foundation/press/kit/asf_logo_small.png"; title="ASF
Logo"/></a>
+<a href="http://www.apache.org/";><img alt="The Apache Software Foundation"
src="https://www.apache.org/foundation/press/kit/asf_logo_small.png"; title="ASF
logo"/></a>
<a href="/"><img alt="whimsy" src="../whimsy.svg" title="whimsy"
width="140"/></a>
![https://www.apache.org/img/feather_glyph_notm.png"](https://www.apache.org/img/feather_glyph_notm.png"){kind=link}
![https://www.apache.org/foundation/press/kit/asf_logo_small.png"/](https://www.apache.org/foundation/press/kit/asf_logo_small.png"/){kind=link}
![https://www.apache.org/foundation/press/kit/asf_logo_small.png"](https://www.apache.org/foundation/press/kit/asf_logo_small.png"){kind=link}