freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker-site git commit: Added missing copyright comments.
Date Sat, 02 Jan 2016 00:21:09 GMT
Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/master 8c339eef4 -> e934e478f


Added missing copyright comments.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/e934e478
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/e934e478
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/e934e478

Branch: refs/heads/master
Commit: e934e478f551bbd800df9bd94b89bddb36bf8f5e
Parents: 8c339ee
Author: ddekany <ddekany@apache.org>
Authored: Sat Jan 2 01:21:00 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Jan 2 01:21:00 2016 +0100

----------------------------------------------------------------------
 README                                          | 32 ++++++++++++++++++++
 README.txt                                      | 12 --------
 build.xml                                       | 18 +++++++++++
 src/main/docgen/book.xml                        | 18 +++++++++++
 .../docgen/docgen-misc/googleAnalytics.html     |  5 +++
 src/main/docgen/docgen.cjson                    | 17 +++++++++++
 src/main/docgen/sitemap-index.xml               | 18 +++++++++++
 7 files changed, 108 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/README
----------------------------------------------------------------------
diff --git a/README b/README
new file mode 100644
index 0000000..05741f8
--- /dev/null
+++ b/README
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+Apache FreeMarker Site
+----------------------
+
+This is the project with which we generate the freemarker.org home page.
+Note that most of the work is done by Apache FreeMarker Docgen, which is
+a dependency of this project.
+
+To publish the built site, comit the output into the "asf-site" branch.
+
+Note that as of this writing, the "docgen" dependency is get from the Ivy
+repo on the published homepage (http://freemarker.org/repos/ivy/). Those
+modifying docgen should upload the fresh docgen jar there. Then you need to
+run `ant update-deps` here to grab the latest version.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 0b69973..0000000
--- a/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache FreeMarker Site
-
-This is just the project with which we generate the freemarker.org home
-page content. Note that most of the work is done by Apache FreeMarker
-Docgen, which is a dependency of this project.
-
-To publish the built site, comit the output into the "asf-site" branch.
-
-Note that as of this writing, the "docgen" dependency is get from the Ivy
-repo on the published homepage (http://freemarker.org/repos/ivy/). Those
-modifying docgen should upload the fresh docgen jar there. Then you need to
-run `ant update-deps` here to grab the latest version.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 663bfdb..b892dd5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 
 <project name="FreeMarker Site" default="pack" basedir="."
   xmlns:ivy="antlib:org.apache.ivy.ant"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 0230193..daa95a7 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <book conformance="docgen" version="5.0" xmlns="http://docbook.org/ns/docbook"
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xi="http://www.w3.org/2001/XInclude"

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/docgen-misc/googleAnalytics.html
----------------------------------------------------------------------
diff --git a/src/main/docgen/docgen-misc/googleAnalytics.html b/src/main/docgen/docgen-misc/googleAnalytics.html
index bf440f2..759564e 100644
--- a/src/main/docgen/docgen-misc/googleAnalytics.html
+++ b/src/main/docgen/docgen-misc/googleAnalytics.html
@@ -1,3 +1,8 @@
+<!--
+  This snippet was generated by Google Analytics.
+  Thus, the standard FreeMarker copyright comment was intentionally omitted.
+  <#DO_NOT_UPDATE_COPYRIGHT>
+-->
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 627364c..df671e7 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -1,5 +1,22 @@
 //charset: UTF-8
 
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+//   http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
 deployUrl: "http://freemarker.org/"
 onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
 offline: false

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/sitemap-index.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/sitemap-index.xml b/src/main/docgen/sitemap-index.xml
index c83c170..68fef2f 100644
--- a/src/main/docgen/sitemap-index.xml
+++ b/src/main/docgen/sitemap-index.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
  <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
    <sitemap>
       <loc>http://www.freemarker.org/sitemap.xml</loc>


Mime
View raw message