You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/11/17 19:10:41 UTC

[2/5] incubator-guacamole-website git commit: GUACAMOLE-436: Note that Apache Guacamole, Guacamole, and the Apache Guacamole logo are ASF trademarks.

GUACAMOLE-436: Note that Apache Guacamole, Guacamole, and the Apache Guacamole logo are ASF trademarks.

>From https://www.apache.org/foundation/marks/list/:

>
> The Apache Software Foundation considers the names of all top level
> projects, all downloadable software products, our feather logo, and the
> logos of our projects to be trademarks of the ASF. The ASF owns all
> Apache trademarks on behalf of our volunteer project communities.
>


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/d23371d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/d23371d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/d23371d5

Branch: refs/heads/master
Commit: d23371d591b1119444a39d3f6356702a235fc17e
Parents: 809f6c7
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Nov 16 23:50:53 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Nov 17 00:38:58 2017 -0800

----------------------------------------------------------------------
 _config.yml           | 2 +-
 _includes/footer.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d23371d5/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index f319d18..9aff937 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,7 +18,7 @@
 #
 
 # Site settings
-title: Apache Guacamole
+title: Apache Guacamoleā„¢
 
 # Build settings
 markdown: kramdown

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d23371d5/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
index 2c18906..6afcdeb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -16,8 +16,9 @@
 
     <!-- Trademarks -->
     <p class="trademarks">
-        Apache and the Apache feather logo are trademarks of The Apache
-        Software Foundation.
+        Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+        Apache Guacamole project logo are trademarks of The Apache Software
+        Foundation.
     </p>
 
 </div>