Skip to content

Commit ade6ec1

Browse files
authored
Merge pull request #1 from creativecommons/content-clarifications
Content clarifications and simple docker config
2 parents 41ba974 + e92fee6 commit ade6ec1

File tree

13 files changed

+76
-74
lines changed

13 files changed

+76
-74
lines changed

docker-compose.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# https://docs.docker.com/compose/compose-file/compose-file-v2/
2+
3+
version: "2.4"
4+
5+
services:
6+
7+
web:
8+
# https://hub.docker.com/_/nginx
9+
image: nginx:latest
10+
ports:
11+
- "8080:80"
12+
restart: on-failure
13+
volumes:
14+
# Mount website directory
15+
- ./docs:/usr/share/nginx/html:ro

docs/about/index.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h3 class="assistive-text">Main menu</h3>
8686
<li id="menu-item-1449" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1449"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li>
8787
</ul>
8888
</li>
89-
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777">Google+ Community</a></li>
89+
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777"><s>Google+ Community</s></a></li>
9090
</ul>
9191
</li>
9292
<li id="menu-item-1474" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1474">
@@ -98,9 +98,8 @@ <h3 class="assistive-text">Main menu</h3>
9898
</li>
9999
<li id="menu-item-1446" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1446"><a href="/find-oer/">Find OER</a></li>
100100
<li id="menu-item-1444" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1444"><a href="/faq/">FAQ</a></li>
101-
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1448"><a href="/contact/">Contact</a></li>
102-
</ul></div> <!--
103-
<div class="menu"><ul><li ><a href="/">Home</a></li><li class="page_item page-item-1088"><a href="/1088-2/"></a></li><li class="page_item page-item-1439"><a href="/vignettes-draft/">#1439 (no title)</a></li><li class="page_item page-item-15 page_item_has_children current_page_item"><a href="/about/" aria-current="page">About</a><ul class='children'><li class="page_item page-item-868"><a href="/about/grantee-showcase/">Grantee Showcase</a></li><li class="page_item page-item-159"><a href="/about/history/">History</a></li><li class="page_item page-item-613"><a href="/about/what-is-open/">What is &quot;open&quot;?</a></li></ul></li><li class="page_item page-item-1147"><a href="/about-v2/">about-v2</a></li><li class="page_item page-item-1175"><a href="/about-v2-2/">about-v2</a></li><li class="page_item page-item-927"><a href="/contact/">Contact</a></li><li class="page_item page-item-1066"><a href="/contact-v2/">Contact_old</a></li><li class="page_item page-item-1063"><a href="/contact-v1/">Contact-v1</a></li><li class="page_item page-item-14 page_item_has_children"><a href="/events/">Events</a><ul class='children'><li class="page_item page-item-214"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li></ul></li><li class="page_item page-item-1084"><a href="/events-calendar/">Events Calendar</a></li><li class="page_item page-item-1051"><a href="/events-v1/">Events-v1</a></li><li class="page_item page-item-1026"><a href="/events-v2/">Events-v2</a></li><li class="page_item page-item-195"><a href="/faq/">FAQ</a></li><li class="page_item page-item-993"><a href="/faq-v2/">FAQ v2</a></li><li class="page_item page-item-398"><a href="/find-oer/">Find OER</a></li><li class="page_item page-item-1351"><a href="/map/">Map</a></li><li class="page_item page-item-1332"><a href="/research/">Research</a></li><li class="page_item page-item-23 page_item_has_children"><a href="/resources/">Resources</a><ul class='children'><li class="page_item page-item-326"><a href="/resources/cc-by-license-implementation-deep-dive-resources/">CC BY license implementation deep dive: Resources</a></li></ul></li><li class="page_item page-item-1231"><a href="/resources-v2/">resources-v2</a></li><li class="page_item page-item-932"><a href="/round-2-kick-off-event/">Round 2 Kick-Off Conference</a></li><li class="page_item page-item-2"><a href="/sample-page/">Sample Page</a></li><li class="page_item page-item-103"><a href="/sandbox/">Sandbox</a></li><li class="page_item page-item-16"><a href="/services/">Services</a></li><li class="page_item page-item-1149"><a href="/services-v2/">services-v2</a></li><li class="page_item page-item-1356"><a href="/trac-7-conference-topeka-ks-2014/">Trac-7 Conference &#8211; Topeka KS &#8211; 2014</a></li><li class="page_item page-item-1427"><a href="/trac-7conf_map/">trac-7conf_map</a></li></ul></div> -->
101+
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1448"><a href="/contact/"><s>Contact</s></a></li>
102+
</ul></div>
104103
</nav><!-- #access -->
105104

106105

docs/about/what-is-open/index.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h3 class="assistive-text">Main menu</h3>
8686
<li id="menu-item-1449" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1449"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li>
8787
</ul>
8888
</li>
89-
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777">Google+ Community</a></li>
89+
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777"><s>Google+ Community</s></a></li>
9090
</ul>
9191
</li>
9292
<li id="menu-item-1474" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1474">
@@ -98,9 +98,8 @@ <h3 class="assistive-text">Main menu</h3>
9898
</li>
9999
<li id="menu-item-1446" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1446"><a href="/find-oer/">Find OER</a></li>
100100
<li id="menu-item-1444" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1444"><a href="/faq/">FAQ</a></li>
101-
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1448"><a href="/contact/">Contact</a></li>
102-
</ul></div> <!--
103-
<div class="menu"><ul><li ><a href="/">Home</a></li><li class="page_item page-item-1088"><a href="/1088-2/"></a></li><li class="page_item page-item-1439"><a href="/vignettes-draft/">#1439 (no title)</a></li><li class="page_item page-item-15 page_item_has_children current_page_ancestor current_page_parent"><a href="/about/">About</a><ul class='children'><li class="page_item page-item-868"><a href="/about/grantee-showcase/">Grantee Showcase</a></li><li class="page_item page-item-159"><a href="/about/history/">History</a></li><li class="page_item page-item-613 current_page_item"><a href="/about/what-is-open/" aria-current="page">What is &quot;open&quot;?</a></li></ul></li><li class="page_item page-item-1147"><a href="/about-v2/">about-v2</a></li><li class="page_item page-item-1175"><a href="/about-v2-2/">about-v2</a></li><li class="page_item page-item-927"><a href="/contact/">Contact</a></li><li class="page_item page-item-1066"><a href="/contact-v2/">Contact_old</a></li><li class="page_item page-item-1063"><a href="/contact-v1/">Contact-v1</a></li><li class="page_item page-item-14 page_item_has_children"><a href="/events/">Events</a><ul class='children'><li class="page_item page-item-214"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li></ul></li><li class="page_item page-item-1084"><a href="/events-calendar/">Events Calendar</a></li><li class="page_item page-item-1051"><a href="/events-v1/">Events-v1</a></li><li class="page_item page-item-1026"><a href="/events-v2/">Events-v2</a></li><li class="page_item page-item-195"><a href="/faq/">FAQ</a></li><li class="page_item page-item-993"><a href="/faq-v2/">FAQ v2</a></li><li class="page_item page-item-398"><a href="/find-oer/">Find OER</a></li><li class="page_item page-item-1351"><a href="/map/">Map</a></li><li class="page_item page-item-1332"><a href="/research/">Research</a></li><li class="page_item page-item-23 page_item_has_children"><a href="/resources/">Resources</a><ul class='children'><li class="page_item page-item-326"><a href="/resources/cc-by-license-implementation-deep-dive-resources/">CC BY license implementation deep dive: Resources</a></li></ul></li><li class="page_item page-item-1231"><a href="/resources-v2/">resources-v2</a></li><li class="page_item page-item-932"><a href="/round-2-kick-off-event/">Round 2 Kick-Off Conference</a></li><li class="page_item page-item-2"><a href="/sample-page/">Sample Page</a></li><li class="page_item page-item-103"><a href="/sandbox/">Sandbox</a></li><li class="page_item page-item-16"><a href="/services/">Services</a></li><li class="page_item page-item-1149"><a href="/services-v2/">services-v2</a></li><li class="page_item page-item-1356"><a href="/trac-7-conference-topeka-ks-2014/">Trac-7 Conference &#8211; Topeka KS &#8211; 2014</a></li><li class="page_item page-item-1427"><a href="/trac-7conf_map/">trac-7conf_map</a></li></ul></div> -->
101+
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1448"><a href="/contact/"><s>Contact</s></a></li>
102+
</ul></div>
104103
</nav><!-- #access -->
105104

106105

docs/contact/index.html

+8-9
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h3 class="assistive-text">Main menu</h3>
8686
<li id="menu-item-1449" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1449"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li>
8787
</ul>
8888
</li>
89-
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777">Google+ Community</a></li>
89+
<li id="menu-item-1470" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-1470"><a href="https://plus.google.com/u/0/communities/110344036906214848777"><s>Google+ Community</s></a></li>
9090
</ul>
9191
</li>
9292
<li id="menu-item-1474" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1474">
@@ -98,9 +98,8 @@ <h3 class="assistive-text">Main menu</h3>
9898
</li>
9999
<li id="menu-item-1446" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1446"><a href="/find-oer/">Find OER</a></li>
100100
<li id="menu-item-1444" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1444"><a href="/faq/">FAQ</a></li>
101-
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item page-item-927 current_page_item menu-item-1448"><a href="/contact/" aria-current="page">Contact</a></li>
102-
</ul></div> <!--
103-
<div class="menu"><ul><li ><a href="/">Home</a></li><li class="page_item page-item-1088"><a href="/1088-2/"></a></li><li class="page_item page-item-1439"><a href="/vignettes-draft/">#1439 (no title)</a></li><li class="page_item page-item-15 page_item_has_children"><a href="/about/">About</a><ul class='children'><li class="page_item page-item-868"><a href="/about/grantee-showcase/">Grantee Showcase</a></li><li class="page_item page-item-159"><a href="/about/history/">History</a></li><li class="page_item page-item-613"><a href="/about/what-is-open/">What is &quot;open&quot;?</a></li></ul></li><li class="page_item page-item-1147"><a href="/about-v2/">about-v2</a></li><li class="page_item page-item-1175"><a href="/about-v2-2/">about-v2</a></li><li class="page_item page-item-927 current_page_item"><a href="/contact/" aria-current="page">Contact</a></li><li class="page_item page-item-1066"><a href="/contact-v2/">Contact_old</a></li><li class="page_item page-item-1063"><a href="/contact-v1/">Contact-v1</a></li><li class="page_item page-item-14 page_item_has_children"><a href="/events/">Events</a><ul class='children'><li class="page_item page-item-214"><a href="/events/kick-off-conference-agenda/">Round 1 Kick-Off Conference</a></li></ul></li><li class="page_item page-item-1084"><a href="/events-calendar/">Events Calendar</a></li><li class="page_item page-item-1051"><a href="/events-v1/">Events-v1</a></li><li class="page_item page-item-1026"><a href="/events-v2/">Events-v2</a></li><li class="page_item page-item-195"><a href="/faq/">FAQ</a></li><li class="page_item page-item-993"><a href="/faq-v2/">FAQ v2</a></li><li class="page_item page-item-398"><a href="/find-oer/">Find OER</a></li><li class="page_item page-item-1351"><a href="/map/">Map</a></li><li class="page_item page-item-1332"><a href="/research/">Research</a></li><li class="page_item page-item-23 page_item_has_children"><a href="/resources/">Resources</a><ul class='children'><li class="page_item page-item-326"><a href="/resources/cc-by-license-implementation-deep-dive-resources/">CC BY license implementation deep dive: Resources</a></li></ul></li><li class="page_item page-item-1231"><a href="/resources-v2/">resources-v2</a></li><li class="page_item page-item-932"><a href="/round-2-kick-off-event/">Round 2 Kick-Off Conference</a></li><li class="page_item page-item-2"><a href="/sample-page/">Sample Page</a></li><li class="page_item page-item-103"><a href="/sandbox/">Sandbox</a></li><li class="page_item page-item-16"><a href="/services/">Services</a></li><li class="page_item page-item-1149"><a href="/services-v2/">services-v2</a></li><li class="page_item page-item-1356"><a href="/trac-7-conference-topeka-ks-2014/">Trac-7 Conference &#8211; Topeka KS &#8211; 2014</a></li><li class="page_item page-item-1427"><a href="/trac-7conf_map/">trac-7conf_map</a></li></ul></div> -->
101+
<li id="menu-item-1448" class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item page-item-927 current_page_item menu-item-1448"><a href="/contact/" aria-current="page"><s>Contact</s></a></li>
102+
</ul></div>
104103
</nav><!-- #access -->
105104

106105

@@ -115,16 +114,16 @@ <h3 class="assistive-text">Main menu</h3>
115114

116115
<article id="post-927" class="post-927 page type-page status-publish hentry">
117116
<header class="entry-header">
118-
<h1 class="entry-title">Contact</h1>
117+
<h1 class="entry-title"><s>Contact</s></h1>
119118
</header><!-- .entry-header -->
120119

121120
<div class="entry-content">
122-
<p>Grantees are encouraged to join the OPEN for TAACCCT Google+ Community, or join the Open4Us mailing list. Click one of the links below to request access to these groups:</p>
121+
<p><s>Grantees are encouraged to join the OPEN for TAACCCT Google+ Community, or join the Open4Us mailing list. Click one of the links below to request access to these groups:</s></p>
123122
<ul>
124123
<li>
125-
<a href="https://plus.google.com/u/0/communities/110344036906214848777">Google+ Community</a>. To join, please request membership with your Google account and email <a href="mailto:taa@creativecommons.org">taa@creativecommons.org</a> with your TAACCCT grant affiliation for confirmation.</li>
124+
<s><a href="https://plus.google.com/u/0/communities/110344036906214848777">Google+ Community</a>. To join, please request membership with your Google account and email <a href="mailto:taa@creativecommons.org">taa@creativecommons.org</a> with your TAACCCT grant affiliation for confirmation.</li></s>
126125
</ul>
127-
<p>Direct inquiries and requests for assistance may be sent to <a href="mailto:taa@creativecommons.org">taa [at] creativecommons [dot] org</a>.</p>
126+
<p><s>Direct inquiries and requests for assistance may be sent to <a href="mailto:taa@creativecommons.org">taa [at] creativecommons [dot] org</a>.</s></p>
128127
</div>
129128
<!-- .entry-content -->
130129
<footer class="entry-meta">
@@ -200,4 +199,4 @@ <h1 class="entry-title">Contact</h1>
200199
<script type="text/javascript" src="/wp-includes/js/comment-reply.min.js?ver=6.1.1" id="comment-reply-js"></script>
201200

202201
</body>
203-
</html>
202+
</html>

0 commit comments

Comments
 (0)