Permalink
Browse files

replaying #208/

  • Loading branch information...
1 parent f93084b commit 3f9c3d2c438c00262043750a1b3f910c090af498 @pw374 pw374 committed Nov 8, 2013
Showing with 28 additions and 20 deletions.
  1. +1 −0 .gitignore
  2. +11 −6 src/Makefile.from_md
  3. +3 −3 src/site/community/index.md
  4. +1 −1 src/site/docs/install.md
  5. +1 −1 src/site/index.md
  6. +11 −9 src/site/learn/index.md
View
@@ -18,3 +18,4 @@ ocaml.org/
ocamltohtml
rss2html
src/tpl/front_code_snippet.html
+.DS_Store
@Chris00

Chris00 Nov 9, 2013

Member

No big harm but IMHO this system dependent directory should rather be in the global ignore file: set in ~/.gitconfig:

[core]
  excludesfile = ~/.git.d/ignore

and then fill ~/.git.d/ignore with system and editor specific patterns.

View
@@ -4,13 +4,18 @@ include Makefile.common
ocaml.org/%.html:site/%.md
$(MAKE) ocaml.org
- if grep -q '*Table of contents*' "$<" ; then ${OMD} -otoc -ts 2 "$<" > "$@.toc" ; fi
- sed -e 's|\*Table of contents\*||g' "$<" | ${OMD} > "$@.tmp"
+ if grep -q '*Table of contents*' "$<" ; then $(MAKE) -f Makefile.from_md "$@.toc" ; fi
+ $(MAKE) -f Makefile.from_md "$@.tmp"
if [ -f "$@.toc" ] ; then \
- ${MPP} -set "filename=$<" -set "page=$@.tmp" -set "toc=$@.toc" tpl/main.mpp -o "$@" ; \
- $(RM) "$@.toc" ; \
+ ${MPP} -set "filename=$<" -set "page=$@.tmp" -set "toc=$@.toc" tpl/main.mpp -o "$@" ; \
else \
- ${MPP} -set "filename=$<" -set "page=$@.tmp" tpl/main.mpp -o "$@" ; \
+ ${MPP} -set "filename=$<" -set "page=$@.tmp" tpl/main.mpp -o "$@" ; \
fi
- $(RM) "$@.tmp"
+# $(RM) "$@.tmp"
+# $(RM) "$@.toc"
+ocaml.org/%.html.toc:site/%.md
+ ${OMD} -otoc -ts 2 "$<" -o "$@"
+
+ocaml.org/%.html.tmp:site/%.md
+ sed -e 's|\*Table of contents\*||g' "$<" | ${OMD} -o "$@"
@@ -11,7 +11,7 @@
</section>
<div class="span4">
<img src="/img/ocaml-large.png" alt="OCaml">
- <p><a href="/docs/logos">More logos</a></p>
+ <p><a href="/docs/logos.html">More logos</a></p>
</div>
</div>
<div class="row">
@@ -33,7 +33,7 @@
<p><strong><a href="http://lists.ocaml.org">lists.ocaml.org</a></strong><br />
<strong><em>Community lists and working groups</em></strong><br />
User-interest lists and working groups convened with specific goals.</p>
- <p><small><em><a href="/community/mailing_lists">Browse all the lists</a>.</em></small></p>
+ <p><small><em><a href="/community/mailing_lists.html">Browse all the lists</a>.</em></small></p>
</section>
<section class="span4 condensed">
<h4>Recent email threads</h4>
@@ -51,7 +51,7 @@
<div class="row">
<section class="span4 condensed">
<h1 class="ruled">Support</h1>
- <p>A great way to get free support is by using the active <a href="/community/mailing_lists">mailing lists</a>. When you need to go beyond this and get professional support, you have a number of options available.</p>
+ <p>A great way to get free support is by using the active <a href="/community/mailing_lists.html">mailing lists</a>. When you need to go beyond this and get professional support, you have a number of options available.</p>
<p>If you would like to give support to OCaml, you can join the Consortium or support the work of OCaml Labs. <a href="/community/support">Find out more</a>.</p>
</section>
<section class="span4 condensed">
View
@@ -506,7 +506,7 @@ mv hello hello.app/Contents/MacOS
Next, create a file `hello.app/Contents/Info.plist` with the following
contents:
-```xml
+```
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
View
@@ -33,7 +33,7 @@
</div>
<div class="row">
<section class="span4 home-feature">
- <a href="/platform">
+ <a href="/docs/install.html">
<img src="/img/platform-large.png" alt="Platform"> </a>
<h1><a href="http://opam.ocaml.org">Packages</a></h1>
<p>The <a href="http://opam.ocaml.org">OCaml Package Manager</a>, gives you to access multiple versions of hundreds of packages. It's the best way to get started for newcomers and a flexible base for experienced users.</p>
View
@@ -8,14 +8,16 @@
</div>
<section id="learn-leader" class="span7">
<h1>What is OCaml?</h1>
- <p>OCaml is a general purpose industrial-strength programming language with an emphasis on expressiveness and safety. <a href="/learn/companies">Used</a> in environments where a single mistake can cost millions and speed matters, it is supported by an <a href="/community">active community</a> that has developed a <a href="https://opam.ocaml.org/pkg/">rich set of libraries</a>. <small><em><a href="/learn/description.html">Read more</a></em></small>.</p>
+ <p>OCaml is a general purpose industrial-strength programming language with an emphasis on expressiveness and safety. <a href="/learn/companies.html">Used</a> in environments where a single mistake can cost millions and speed matters, it is supported by an <a href="/community/">active community</a> that has developed a <a href="https://opam.ocaml.org/pkg/">rich set of libraries</a>. <small><em><a href="/learn/description.html">Read more</a></em></small>.</p>
</section>
<div id="platform-download" class="span3">
- <p><a href="#" class="btn">Install on Mac OSX</a></p>
+ <p><a href="/docs/install.html" class="btn">Install</a></p>
+<!--
<p>
<a href="#">Other systems</a> |
<a href="#">What's new?</a>
</p>
+-->
</div>
</div>
<div class="row">
@@ -27,13 +29,13 @@
<section class="span4 condensed">
<h1 class="ruled">Tutorials</h1>
<ul>
- <li><a href="/learn/tutorials/basics">Basics</a></li>
- <li><a href="/learn/tutorials/structure_of_ocaml_programs">Structure of OCaml Programs</a></li>
- <li><a href="/learn/tutorials/map">Maps (Dictionaries)</a></li>
- <li><a href="/learn/tutorials/set">Sets</a></li>
- <li><a href="/learn/tutorials/hashtbl">Hash Tables</a></li>
- <li><a href="/learn/tutorials/comparison_of_standard_containers">Comparison of Standard Containers</a></li>
- <li><a href="/learn/tutorials/data_types_and_matching">Data Types and Matching</a></li>
+ <li><a href="/learn/tutorials/basics.html">Basics</a></li>
+ <li><a href="/learn/tutorials/structure_of_ocaml_programs.html">Structure of OCaml Programs</a></li>
+ <li><a href="/learn/tutorials/map.html">Maps (Dictionaries)</a></li>
+ <li><a href="/learn/tutorials/set.html">Sets</a></li>
+ <li><a href="/learn/tutorials/hashtbl.html">Hash Tables</a></li>
+ <li><a href="/learn/tutorials/comparison_of_standard_containers.html">Comparison of Standard Containers</a></li>
+ <li><a href="/learn/tutorials/data_types_and_matching.html">Data Types and Matching</a></li>
</ul>
<footer>
<p><a href="/learn/tutorials">See full list</a></p>

1 comment on commit 3f9c3d2

Contributor

pw374 commented on 3f9c3d2 Nov 8, 2013

it's actually "replaying #208 + some other fixes"

Please sign in to comment.