http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/faq.html
----------------------------------------------------------------------
diff --git a/6.0/faq.html b/6.0/faq.html
new file mode 100644
index 0000000..8db5143
--- /dev/null
+++ b/6.0/faq.html
@@ -0,0 +1,376 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>Joshua Documentation | Frequently Asked Questions</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/joshua6.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <div class="blog-masthead">
+      <div class="container">
+        <nav class="blog-nav">
+          <!-- <a class="blog-nav-item active" href="#">Joshua</a> -->
+          <a class="blog-nav-item" href="/">Joshua</a>
+          <!-- <a class="blog-nav-item" href="/6.0/whats-new.html">New 
features</a> -->
+          <a class="blog-nav-item" href="/language-packs/">Language packs</a>
+          <a class="blog-nav-item" href="/data/">Datasets</a>
+          <a class="blog-nav-item" href="/support/">Support</a>
+          <a class="blog-nav-item" href="/contributors.html">Contributors</a>
+        </nav>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <div class="row">
+
+        <div class="col-sm-2">
+          <div class="sidebar-module">
+            <!-- <h4>About</h4> -->
+            <center>
+            <img src="/images/joshua-logo-small.png" />
+            <p>Joshua machine translation toolkit</p>
+            </center>
+          </div>
+          <hr>
+          <center>
+            <a href="/releases/current/" target="_blank"><button 
class="button">Download Joshua 6.0.5</button></a>
+            <br />
+            <a href="/releases/runtime/" target="_blank"><button 
class="button">Runtime only version</button></a>
+            <p>Released November 5, 2015</p>
+          </center>
+          <hr>
+          <!-- <div class="sidebar-module"> -->
+          <!--   <span id="download"> -->
+          <!--     <a 
href="http://joshua-decoder.org/downloads/joshua-6.0.tgz";>Download</a> -->
+          <!--   </span> -->
+          <!-- </div> -->
+          <div class="sidebar-module">
+            <h4>Using Joshua</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/install.html">Installation</a></li>
+              <li><a href="/6.0/quick-start.html">Quick Start</a></li>
+            </ol>
+          </div>
+          <hr>
+          <div class="sidebar-module">
+            <h4>Building new models</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/pipeline.html">Pipeline</a></li>
+              <li><a href="/6.0/tutorial.html">Tutorial</a></li>
+              <li><a href="/6.0/faq.html">FAQ</a></li>
+            </ol>
+          </div>
+<!--
+          <div class="sidebar-module">
+            <h4>Phrase-based</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/phrase.html">Training</a></li>
+            </ol>
+          </div>
+-->
+          <hr>
+          <div class="sidebar-module">
+            <h4>Advanced</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/bundle.html">Building language packs</a></li>
+              <li><a href="/6.0/decoder.html">Decoder options</a></li>
+              <li><a href="/6.0/file-formats.html">File formats</a></li>
+              <li><a href="/6.0/packing.html">Packing TMs</a></li>
+              <li><a href="/6.0/large-lms.html">Building large LMs</a></li>
+            </ol>
+          </div>
+
+          <hr> 
+          <div class="sidebar-module">
+            <h4>Developer</h4>
+            <ol class="list-unstyled">              
+               <li><a 
href="https://github.com/joshua-decoder/joshua";>Github</a></li>
+               <li><a 
href="http://cs.jhu.edu/~post/joshua-docs";>Javadoc</a></li>
+               <li><a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Mailing
 list</a></li>              
+            </ol>
+          </div>
+
+        </div><!-- /.blog-sidebar -->
+
+        
+        <div class="col-sm-8 blog-main">
+        
+
+          <div class="blog-title">
+            <h2>Frequently Asked Questions</h2>
+          </div>
+          
+          <div class="blog-post">
+
+            <p>Solutions to common problems will be posted here as we become 
aware of
+them.  If you need help with something, please check
+<a href="https://groups.google.com/forum/#!forum/joshua_support";>our support 
group</a>
+for a solution, or
+<a href="https://groups.google.com/forum/#!newtopic/joshua_support";>post a new 
question</a>.</p>
+
+<h3 id="i-get-a-message-stating-no-ken-in-javalibrarypath">I get a message 
stating: “no ken in java.library.path”</h3>
+
+<p>This occurs when <a href="https://kheafield.com/code/kenlm/";>KenLM</a> 
failed to
+build. This can occur for a number of reasons:</p>
+
+<ul>
+  <li>
+    <p><a href="http://www.boost.org/";>Boost</a> isn’t installed. Boost is
+available through most package management tools, so try that
+first. You can also build it from source.</p>
+  </li>
+  <li>
+    <p>Boost is installed, but not in your path. The easiest solution is
+to add the boost library directory to your <code 
class="highlighter-rouge">$LD_LIBRARY_PATH</code>
+environment variable. You can also edit the file
+<code 
class="highlighter-rouge">$JOSHUA/src/joshua/decoder/ff/lm/kenlm/Makefile</code>
 and define
+<code class="highlighter-rouge">BOOST_ROOT</code> to point to your boost 
location. Then rebuild KenLM
+with the command</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>ant -f 
$JOSHUA/build.xml kenlm
+</code></pre>
+    </div>
+  </li>
+  <li>
+    <p>You have run into boost’s weird naming of multi-threaded
+libraries. For some reason, boost libraries sometimes have a
+<code class="highlighter-rouge">-mt</code> extension applied when they are 
built with multi-threaded
+support. This will cause the linker to fail, since it is looking
+for, e.g., <code class="highlighter-rouge">-lboost_system</code> instead of 
<code class="highlighter-rouge">-lboost_system-mt</code>. Edit
+the same Makefile as above and uncomment the <code 
class="highlighter-rouge">BOOST_MT = -mt</code>
+line, then try to compile again with</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>ant -f 
$JOSHUA.build.xml kenlm
+</code></pre>
+    </div>
+  </li>
+</ul>
+
+<p>You may find the following reference URLs to be useful.</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>https://groups.google.com/forum/#!topic/joshua_support/SiGO41tkpsw
+http://stackoverflow.com/questions/12583080/c-library-in-using-boost-library
+</code></pre>
+</div>
+
+<h3 id="how-do-i-make-joshua-produce-better-results">How do I make Joshua 
produce better results?</h3>
+
+<p>One way is to add a larger language model. Build on Gigaword, news
+crawl data, etc. <code class="highlighter-rouge">lmplz</code> makes it easy to 
build and efficient to
+represent (especially if you compress it with `build_binary). To
+include it in Joshua, there are two ways:</p>
+
+<ul>
+  <li>
+    <p><em>Pipeline</em>. By default, Joshua’s pipeline builds a language
+ model on the target side of your parallel training data. But
+ Joshua can decode with any number of additional language models
+ as well. So you can build a language model separately,
+ presumably on much more data (since you won’t be constrained
+ only to one side of parallel data, which is much more scarce
+ than monolingual data). Once you’ve built extra language models
+ and compiled them with KenLM’s <code 
class="highlighter-rouge">build_binary</code> script, you can
+ tell the pipeline to use them with any number of <code 
class="highlighter-rouge">--lmfile
+ /path/to/lm/file</code> flags.</p>
+  </li>
+  <li>
+    <p><em>Joshua</em> (directly).
+    <a href="http://localhost:4000/6.0/file-formats.html";>This file</a>
+    documents the Joshua configuration file format.</p>
+  </li>
+</ul>
+
+<h3 
id="i-have-already-run-the-pipeline-once-how-do-i-run-it-again-skipping-the-early-stages-and-just-retuning-the-model">I
 have already run the pipeline once. How do I run it again, skipping the early 
stages and just retuning the model?</h3>
+
+<p>You would need to do this if, for example, you added a language
+model, or changed some other parameter (e.g., an improvement to the
+decoder). To do this, follow the following steps:</p>
+
+<ul>
+  <li>Re-run the pipeline giving it a new <code 
class="highlighter-rouge">--rundir N+1</code> (where <code 
class="highlighter-rouge">N</code> is the last
+run, and <code class="highlighter-rouge">N+1</code> is a new, non-existent 
directory). </li>
+  <li>Give it all the other flags that you gave before, such as the
+tuning data, testing data, source and target flags, etc. You
+don’t have to give it the training data.</li>
+  <li>Tell it to start at the tuning step with <code 
class="highlighter-rouge">--first-step TUNE</code></li>
+  <li>Tell it where all of your language model files are with <code 
class="highlighter-rouge">--lmfile
+/path/to/lm</code> lines. You also have to tell it where the main
+language model is, which is usually <code class="highlighter-rouge">--lmfile 
N/lm.kenlm</code> (paths
+are relative to the directory above the run directory.</li>
+  <li>Tell it where the main grammar is, e.g., <code 
class="highlighter-rouge">--grammar
+N/grammar.gz</code>. If the tuning and test data hasn’t changed, you
+can also point it to the filtered and packed versions to save a
+little time using <code class="highlighter-rouge">--tune-grammar 
N/data/tune/grammar.packed</code> and
+<code class="highlighter-rouge">--test-grammar 
N/data/test/grammar.packed</code>, where <code 
class="highlighter-rouge">N</code> here again
+is the previous run (or some other run; it can be anywhere).</li>
+</ul>
+
+<p>Here’s an example. Let’s say you ran a full pipeline as run 1, and
+now added a new language model and want to see how it affects the
+decoder. Your first run might have been invoked like this:</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/scripts/training/pipeline.pl \
+  --rundir 1 \
+  --readme "Baseline French--English Europarl hiero system" \
+  --corpus /path/to/europarl \
+  --tune /path/to/europarl/tune \
+  --test /path/to/europarl/test \
+  --source fr \
+  --target en \
+  --threads 8 \
+  --joshua-mem 30g \
+  --tuner mira \
+  --type hiero \
+  --aligner berkeley
+</code></pre>
+</div>
+
+<p>Your new run will look like this:</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/scripts/training/pipeline.pl \
+  --rundir 2 \
+  --readme "Adding in a huge language model" \
+  --tune /path/to/europarl/tune \
+  --test /path/to/europarl/test \
+  --source fr \
+  --target en \
+  --threads 8 \
+  --joshua-mem 30g \
+  --tuner mira \
+  --type hiero \
+  --aligner berkeley \
+  --first-step TUNE \
+  --lmfile 1/lm.kenlm \
+  --lmfile /path/to/huge/new/lm \
+  --tune-grammar 1/data/tune/grammar.packed \
+  --test-grammar 1/data/test/grammar.packed
+</code></pre>
+</div>
+
+<p>Notice the changes: we removed the <code 
class="highlighter-rouge">--corpus</code> (though it would have
+been fine to have left it, it would have just been skipped),
+specified the first step, changed the run directory and README
+comments, and pointed to the grammars and <em>both</em> language model 
files.</p>
+
+<p>How can I enable specific feature functions?</p>
+
+<p>Let’s say you created a new feature function, <code 
class="highlighter-rouge">OracleFeature</code>, and
+you want to enable it. You can do this in two ways. Through the
+pipeline, simply pass it the argument <code 
class="highlighter-rouge">--joshua-args "list of
+joshua args"</code>. These will then be passed to the decoder when it is
+invoked. You can enable your feature functions, then using
+something like</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/bin/pipeline.pl --joshua-args 
'-feature-function OracleFeature'   
+</code></pre>
+</div>
+
+<p>If you call the decoder directly, you can just put that line in
+the configuration file, e.g.,</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>feature-function = 
OracleFeature
+</code></pre>
+</div>
+
+<p>or you can pass it directly to Joshua on the command line using
+the standard notation, e.g.,</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/bin/joshua-decoder -feature-function 
OracleFeature
+</code></pre>
+</div>
+
+<p>These could be stacked, e.g.,</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/bin/joshua-decoder -feature-function 
OracleFeature \
+    -feature-function MagicFeature \
+    -feature-function MTSolverFeature \
+    ...
+</code></pre>
+</div>
+
+
+          <!--   <h4 class="blog-post-title">Welcome to Joshua!</h4> -->
+
+          <!--   <p>This blog post shows a few different types of content 
that's supported and styled with Bootstrap. Basic typography, images, and code 
are all supported.</p> -->
+          <!--   <hr> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis <a href="#">dis 
parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque 
ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at 
lobortis. Cras mattis consectetur purus sit amet fermentum.</p> -->
+          <!--   <blockquote> -->
+          <!--     <p>Curabitur blandit tempus porttitor. <strong>Nullam quis 
risus eget urna mollis</strong> ornare vel eu leo. Nullam id dolor id nibh 
ultricies vehicula ut id elit.</p> -->
+          <!--   </blockquote> -->
+          <!--   <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. 
Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla 
sed consectetur.</p> -->
+          <!--   <h2>Heading</h2> -->
+          <!--   <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus 
dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, 
eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, 
vestibulum at eros.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</p> -->
+          <!--   <pre><code>Example code block</code></pre> -->
+          <!--   <p>Aenean lacinia bibendum nulla sed consectetur. Etiam porta 
sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, 
tortor mauris condimentum nibh, ut fermentum massa.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. 
Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus 
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet 
risus.</p> -->
+          <!--   <ul> -->
+          <!--     <li>Praesent commodo cursus magna, vel scelerisque nisl 
consectetur et.</li> -->
+          <!--     <li>Donec id elit non mi porta gravida at eget metus.</li> 
-->
+          <!--     <li>Nulla vitae elit libero, a pharetra augue.</li> -->
+          <!--   </ul> -->
+          <!--   <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla 
vitae elit libero, a pharetra augue.</p> -->
+          <!--   <ol> -->
+          <!--     <li>Vestibulum id ligula porta felis euismod semper.</li> 
-->
+          <!--     <li>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</li> -->
+          <!--     <li>Maecenas sed diam eget risus varius blandit sit amet 
non magna.</li> -->
+          <!--   </ol> -->
+          <!--   <p>Cras mattis consectetur purus sit amet fermentum. Sed 
posuere consectetur est at lobortis.</p> -->
+          <!-- </div><\!-- /.blog-post -\-> -->
+
+        </div>
+
+      </div><!-- /.row -->
+
+      
+        
+    </div><!-- /.container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- <script src="../../assets/js/docs.min.js"></script> -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <!-- <script 
src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+    -->
+
+    <!-- Start of StatCounter Code for Default Guide -->
+    <script type="text/javascript">
+      var sc_project=8264132; 
+      var sc_invisible=1; 
+      var sc_security="4b97fe2d"; 
+    </script>
+    <script type="text/javascript" 
src="http://www.statcounter.com/counter/counter.js";></script>
+    <noscript>
+      <div class="statcounter">
+        <a title="hit counter joomla" 
+           href="http://statcounter.com/joomla/";
+           target="_blank">
+          <img class="statcounter"
+               src="http://c.statcounter.com/8264132/0/4b97fe2d/1/";
+               alt="hit counter joomla" />
+        </a>
+      </div>
+    </noscript>
+    <!-- End of StatCounter Code for Default Guide -->
+  </body>
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/faq.md
----------------------------------------------------------------------
diff --git a/6.0/faq.md b/6.0/faq.md
deleted file mode 100644
index cc06b11..0000000
--- a/6.0/faq.md
+++ /dev/null
@@ -1,161 +0,0 @@
----
-layout: default6
-category: help
-title: Frequently Asked Questions
----
-
-Solutions to common problems will be posted here as we become aware of
-them.  If you need help with something, please check
-[our support group](https://groups.google.com/forum/#!forum/joshua_support)
-for a solution, or
-[post a new 
question](https://groups.google.com/forum/#!newtopic/joshua_support).
-
-### I get a message stating: "no ken in java.library.path"
-
-This occurs when [KenLM](https://kheafield.com/code/kenlm/) failed to
-build. This can occur for a number of reasons:
-   
-- [Boost](http://www.boost.org/) isn't installed. Boost is
-  available through most package management tools, so try that
-  first. You can also build it from source.
-
-- Boost is installed, but not in your path. The easiest solution is
-  to add the boost library directory to your `$LD_LIBRARY_PATH`
-  environment variable. You can also edit the file
-  `$JOSHUA/src/joshua/decoder/ff/lm/kenlm/Makefile` and define
-  `BOOST_ROOT` to point to your boost location. Then rebuild KenLM
-  with the command
-  
-      ant -f $JOSHUA/build.xml kenlm
-
-- You have run into boost's weird naming of multi-threaded
-  libraries. For some reason, boost libraries sometimes have a
-  `-mt` extension applied when they are built with multi-threaded
-  support. This will cause the linker to fail, since it is looking
-  for, e.g., `-lboost_system` instead of `-lboost_system-mt`. Edit
-  the same Makefile as above and uncomment the `BOOST_MT = -mt`
-  line, then try to compile again with
-  
-      ant -f $JOSHUA.build.xml kenlm
-
-You may find the following reference URLs to be useful.
-
-    https://groups.google.com/forum/#!topic/joshua_support/SiGO41tkpsw
-    
http://stackoverflow.com/questions/12583080/c-library-in-using-boost-library
-
-
-### How do I make Joshua produce better results?
-
-One way is to add a larger language model. Build on Gigaword, news
-crawl data, etc. `lmplz` makes it easy to build and efficient to
-represent (especially if you compress it with `build_binary). To
-include it in Joshua, there are two ways:
-
-- *Pipeline*. By default, Joshua's pipeline builds a language
-   model on the target side of your parallel training data. But
-   Joshua can decode with any number of additional language models
-   as well. So you can build a language model separately,
-   presumably on much more data (since you won't be constrained
-   only to one side of parallel data, which is much more scarce
-   than monolingual data). Once you've built extra language models
-   and compiled them with KenLM's `build_binary` script, you can
-   tell the pipeline to use them with any number of `--lmfile
-   /path/to/lm/file` flags.
-
-- *Joshua* (directly).
-      [This file](http://localhost:4000/6.0/file-formats.html)
-      documents the Joshua configuration file format.
-
-### I have already run the pipeline once. How do I run it again, skipping the 
early stages and just retuning the model?
-
-You would need to do this if, for example, you added a language
-model, or changed some other parameter (e.g., an improvement to the
-decoder). To do this, follow the following steps:
-
-- Re-run the pipeline giving it a new `--rundir N+1` (where `N` is the last
-  run, and `N+1` is a new, non-existent directory). 
-- Give it all the other flags that you gave before, such as the
-  tuning data, testing data, source and target flags, etc. You
-  don't have to give it the training data.
-- Tell it to start at the tuning step with `--first-step TUNE`
-- Tell it where all of your language model files are with `--lmfile
-  /path/to/lm` lines. You also have to tell it where the main
-  language model is, which is usually `--lmfile N/lm.kenlm` (paths
-  are relative to the directory above the run directory.
-- Tell it where the main grammar is, e.g., `--grammar
-  N/grammar.gz`. If the tuning and test data hasn't changed, you
-  can also point it to the filtered and packed versions to save a
-  little time using `--tune-grammar N/data/tune/grammar.packed` and
-  `--test-grammar N/data/test/grammar.packed`, where `N` here again
-  is the previous run (or some other run; it can be anywhere).
-
-Here's an example. Let's say you ran a full pipeline as run 1, and
-now added a new language model and want to see how it affects the
-decoder. Your first run might have been invoked like this:
-
-    $JOSHUA/scripts/training/pipeline.pl \
-      --rundir 1 \
-      --readme "Baseline French--English Europarl hiero system" \
-      --corpus /path/to/europarl \
-      --tune /path/to/europarl/tune \
-      --test /path/to/europarl/test \
-      --source fr \
-      --target en \
-      --threads 8 \
-      --joshua-mem 30g \
-      --tuner mira \
-      --type hiero \
-      --aligner berkeley
-
-Your new run will look like this:
-
-    $JOSHUA/scripts/training/pipeline.pl \
-      --rundir 2 \
-      --readme "Adding in a huge language model" \
-      --tune /path/to/europarl/tune \
-      --test /path/to/europarl/test \
-      --source fr \
-      --target en \
-      --threads 8 \
-      --joshua-mem 30g \
-      --tuner mira \
-      --type hiero \
-      --aligner berkeley \
-      --first-step TUNE \
-      --lmfile 1/lm.kenlm \
-      --lmfile /path/to/huge/new/lm \
-      --tune-grammar 1/data/tune/grammar.packed \
-      --test-grammar 1/data/test/grammar.packed
-
-Notice the changes: we removed the `--corpus` (though it would have
-been fine to have left it, it would have just been skipped),
-specified the first step, changed the run directory and README
-comments, and pointed to the grammars and *both* language model files.
-
-How can I enable specific feature functions?
-
-Let's say you created a new feature function, `OracleFeature`, and
-you want to enable it. You can do this in two ways. Through the
-pipeline, simply pass it the argument `--joshua-args "list of
-joshua args"`. These will then be passed to the decoder when it is
-invoked. You can enable your feature functions, then using
-something like
-
-    $JOSHUA/bin/pipeline.pl --joshua-args '-feature-function OracleFeature'   
-
-If you call the decoder directly, you can just put that line in
-the configuration file, e.g.,
-
-    feature-function = OracleFeature
-    
-or you can pass it directly to Joshua on the command line using
-the standard notation, e.g.,
-
-    $JOSHUA/bin/joshua-decoder -feature-function OracleFeature
-    
-These could be stacked, e.g.,
-    
-    $JOSHUA/bin/joshua-decoder -feature-function OracleFeature \
-        -feature-function MagicFeature \
-        -feature-function MTSolverFeature \
-        ...

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/features.html
----------------------------------------------------------------------
diff --git a/6.0/features.html b/6.0/features.html
new file mode 100644
index 0000000..6e617cf
--- /dev/null
+++ b/6.0/features.html
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>Joshua Documentation | Features</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/joshua6.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <div class="blog-masthead">
+      <div class="container">
+        <nav class="blog-nav">
+          <!-- <a class="blog-nav-item active" href="#">Joshua</a> -->
+          <a class="blog-nav-item" href="/">Joshua</a>
+          <!-- <a class="blog-nav-item" href="/6.0/whats-new.html">New 
features</a> -->
+          <a class="blog-nav-item" href="/language-packs/">Language packs</a>
+          <a class="blog-nav-item" href="/data/">Datasets</a>
+          <a class="blog-nav-item" href="/support/">Support</a>
+          <a class="blog-nav-item" href="/contributors.html">Contributors</a>
+        </nav>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <div class="row">
+
+        <div class="col-sm-2">
+          <div class="sidebar-module">
+            <!-- <h4>About</h4> -->
+            <center>
+            <img src="/images/joshua-logo-small.png" />
+            <p>Joshua machine translation toolkit</p>
+            </center>
+          </div>
+          <hr>
+          <center>
+            <a href="/releases/current/" target="_blank"><button 
class="button">Download Joshua 6.0.5</button></a>
+            <br />
+            <a href="/releases/runtime/" target="_blank"><button 
class="button">Runtime only version</button></a>
+            <p>Released November 5, 2015</p>
+          </center>
+          <hr>
+          <!-- <div class="sidebar-module"> -->
+          <!--   <span id="download"> -->
+          <!--     <a 
href="http://joshua-decoder.org/downloads/joshua-6.0.tgz";>Download</a> -->
+          <!--   </span> -->
+          <!-- </div> -->
+          <div class="sidebar-module">
+            <h4>Using Joshua</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/install.html">Installation</a></li>
+              <li><a href="/6.0/quick-start.html">Quick Start</a></li>
+            </ol>
+          </div>
+          <hr>
+          <div class="sidebar-module">
+            <h4>Building new models</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/pipeline.html">Pipeline</a></li>
+              <li><a href="/6.0/tutorial.html">Tutorial</a></li>
+              <li><a href="/6.0/faq.html">FAQ</a></li>
+            </ol>
+          </div>
+<!--
+          <div class="sidebar-module">
+            <h4>Phrase-based</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/phrase.html">Training</a></li>
+            </ol>
+          </div>
+-->
+          <hr>
+          <div class="sidebar-module">
+            <h4>Advanced</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/bundle.html">Building language packs</a></li>
+              <li><a href="/6.0/decoder.html">Decoder options</a></li>
+              <li><a href="/6.0/file-formats.html">File formats</a></li>
+              <li><a href="/6.0/packing.html">Packing TMs</a></li>
+              <li><a href="/6.0/large-lms.html">Building large LMs</a></li>
+            </ol>
+          </div>
+
+          <hr> 
+          <div class="sidebar-module">
+            <h4>Developer</h4>
+            <ol class="list-unstyled">              
+               <li><a 
href="https://github.com/joshua-decoder/joshua";>Github</a></li>
+               <li><a 
href="http://cs.jhu.edu/~post/joshua-docs";>Javadoc</a></li>
+               <li><a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Mailing
 list</a></li>              
+            </ol>
+          </div>
+
+        </div><!-- /.blog-sidebar -->
+
+        
+        <div class="col-sm-8 blog-main">
+        
+
+          <div class="blog-title">
+            <h2>Features</h2>
+          </div>
+          
+          <div class="blog-post">
+
+            <p>Joshua 5.0 uses a sparse feature representation to encode 
features internally.</p>
+
+
+          <!--   <h4 class="blog-post-title">Welcome to Joshua!</h4> -->
+
+          <!--   <p>This blog post shows a few different types of content 
that's supported and styled with Bootstrap. Basic typography, images, and code 
are all supported.</p> -->
+          <!--   <hr> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis <a href="#">dis 
parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque 
ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at 
lobortis. Cras mattis consectetur purus sit amet fermentum.</p> -->
+          <!--   <blockquote> -->
+          <!--     <p>Curabitur blandit tempus porttitor. <strong>Nullam quis 
risus eget urna mollis</strong> ornare vel eu leo. Nullam id dolor id nibh 
ultricies vehicula ut id elit.</p> -->
+          <!--   </blockquote> -->
+          <!--   <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. 
Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla 
sed consectetur.</p> -->
+          <!--   <h2>Heading</h2> -->
+          <!--   <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus 
dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, 
eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, 
vestibulum at eros.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</p> -->
+          <!--   <pre><code>Example code block</code></pre> -->
+          <!--   <p>Aenean lacinia bibendum nulla sed consectetur. Etiam porta 
sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, 
tortor mauris condimentum nibh, ut fermentum massa.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. 
Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus 
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet 
risus.</p> -->
+          <!--   <ul> -->
+          <!--     <li>Praesent commodo cursus magna, vel scelerisque nisl 
consectetur et.</li> -->
+          <!--     <li>Donec id elit non mi porta gravida at eget metus.</li> 
-->
+          <!--     <li>Nulla vitae elit libero, a pharetra augue.</li> -->
+          <!--   </ul> -->
+          <!--   <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla 
vitae elit libero, a pharetra augue.</p> -->
+          <!--   <ol> -->
+          <!--     <li>Vestibulum id ligula porta felis euismod semper.</li> 
-->
+          <!--     <li>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</li> -->
+          <!--     <li>Maecenas sed diam eget risus varius blandit sit amet 
non magna.</li> -->
+          <!--   </ol> -->
+          <!--   <p>Cras mattis consectetur purus sit amet fermentum. Sed 
posuere consectetur est at lobortis.</p> -->
+          <!-- </div><\!-- /.blog-post -\-> -->
+
+        </div>
+
+      </div><!-- /.row -->
+
+      
+        
+    </div><!-- /.container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- <script src="../../assets/js/docs.min.js"></script> -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <!-- <script 
src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+    -->
+
+    <!-- Start of StatCounter Code for Default Guide -->
+    <script type="text/javascript">
+      var sc_project=8264132; 
+      var sc_invisible=1; 
+      var sc_security="4b97fe2d"; 
+    </script>
+    <script type="text/javascript" 
src="http://www.statcounter.com/counter/counter.js";></script>
+    <noscript>
+      <div class="statcounter">
+        <a title="hit counter joomla" 
+           href="http://statcounter.com/joomla/";
+           target="_blank">
+          <img class="statcounter"
+               src="http://c.statcounter.com/8264132/0/4b97fe2d/1/";
+               alt="hit counter joomla" />
+        </a>
+      </div>
+    </noscript>
+    <!-- End of StatCounter Code for Default Guide -->
+  </body>
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/features.md
----------------------------------------------------------------------
diff --git a/6.0/features.md b/6.0/features.md
deleted file mode 100644
index f9406a9..0000000
--- a/6.0/features.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default6
-title: Features
----
-
-Joshua 5.0 uses a sparse feature representation to encode features internally.

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/file-formats.html
----------------------------------------------------------------------
diff --git a/6.0/file-formats.html b/6.0/file-formats.html
new file mode 100644
index 0000000..4918253
--- /dev/null
+++ b/6.0/file-formats.html
@@ -0,0 +1,270 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>Joshua Documentation | Joshua file formats</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/joshua6.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <div class="blog-masthead">
+      <div class="container">
+        <nav class="blog-nav">
+          <!-- <a class="blog-nav-item active" href="#">Joshua</a> -->
+          <a class="blog-nav-item" href="/">Joshua</a>
+          <!-- <a class="blog-nav-item" href="/6.0/whats-new.html">New 
features</a> -->
+          <a class="blog-nav-item" href="/language-packs/">Language packs</a>
+          <a class="blog-nav-item" href="/data/">Datasets</a>
+          <a class="blog-nav-item" href="/support/">Support</a>
+          <a class="blog-nav-item" href="/contributors.html">Contributors</a>
+        </nav>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <div class="row">
+
+        <div class="col-sm-2">
+          <div class="sidebar-module">
+            <!-- <h4>About</h4> -->
+            <center>
+            <img src="/images/joshua-logo-small.png" />
+            <p>Joshua machine translation toolkit</p>
+            </center>
+          </div>
+          <hr>
+          <center>
+            <a href="/releases/current/" target="_blank"><button 
class="button">Download Joshua 6.0.5</button></a>
+            <br />
+            <a href="/releases/runtime/" target="_blank"><button 
class="button">Runtime only version</button></a>
+            <p>Released November 5, 2015</p>
+          </center>
+          <hr>
+          <!-- <div class="sidebar-module"> -->
+          <!--   <span id="download"> -->
+          <!--     <a 
href="http://joshua-decoder.org/downloads/joshua-6.0.tgz";>Download</a> -->
+          <!--   </span> -->
+          <!-- </div> -->
+          <div class="sidebar-module">
+            <h4>Using Joshua</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/install.html">Installation</a></li>
+              <li><a href="/6.0/quick-start.html">Quick Start</a></li>
+            </ol>
+          </div>
+          <hr>
+          <div class="sidebar-module">
+            <h4>Building new models</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/pipeline.html">Pipeline</a></li>
+              <li><a href="/6.0/tutorial.html">Tutorial</a></li>
+              <li><a href="/6.0/faq.html">FAQ</a></li>
+            </ol>
+          </div>
+<!--
+          <div class="sidebar-module">
+            <h4>Phrase-based</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/phrase.html">Training</a></li>
+            </ol>
+          </div>
+-->
+          <hr>
+          <div class="sidebar-module">
+            <h4>Advanced</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/bundle.html">Building language packs</a></li>
+              <li><a href="/6.0/decoder.html">Decoder options</a></li>
+              <li><a href="/6.0/file-formats.html">File formats</a></li>
+              <li><a href="/6.0/packing.html">Packing TMs</a></li>
+              <li><a href="/6.0/large-lms.html">Building large LMs</a></li>
+            </ol>
+          </div>
+
+          <hr> 
+          <div class="sidebar-module">
+            <h4>Developer</h4>
+            <ol class="list-unstyled">              
+               <li><a 
href="https://github.com/joshua-decoder/joshua";>Github</a></li>
+               <li><a 
href="http://cs.jhu.edu/~post/joshua-docs";>Javadoc</a></li>
+               <li><a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Mailing
 list</a></li>              
+            </ol>
+          </div>
+
+        </div><!-- /.blog-sidebar -->
+
+        
+        <div class="col-sm-8 blog-main">
+        
+
+          <div class="blog-title">
+            <h2>Joshua file formats</h2>
+          </div>
+          
+          <div class="blog-post">
+
+            <p>This page describes the formats of Joshua configuration and 
support files.</p>
+
+<h2 id="translation-models-grammars">Translation models (grammars)</h2>
+
+<p>Joshua supports two grammar file formats: a text-based version (also used 
by Hiero, shared by
+<a href="">cdec</a>, and supported by <a href="">hierarchical Moses</a>), and 
an efficient
+<a href="packing.html">packed representation</a> developed by <a 
href="http://cs.jhu.edu/~juri";>Juri Ganitkevich</a>.</p>
+
+<p>Grammar rules follow this format.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[LHS] ||| 
SOURCE-SIDE ||| TARGET-SIDE ||| FEATURES
+</code></pre>
+</div>
+
+<p>The source and target sides contain a mixture of terminals and 
nonterminals. The nonterminals are
+linked across sides by indices. There is no limit to the number of paired 
nonterminals in the rule
+or on the nonterminal labels (Joshua supports decoding with SAMT and GHKM 
grammars).</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[X] ||| el chico 
[X,1] ||| the boy [X,1] ||| -3.14 0 2 17
+[S] ||| el chico [VP,1] ||| the boy [VP,1] ||| -3.14 0 2 17
+[VP] ||| [NP,1] [IN,2] [VB,3] ||| [VB,3] [IN,2] [NP,1] ||| 0.0019026637 
0.81322956
+</code></pre>
+</div>
+
+<p>The feature values can have optional labels, e.g.:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[X] ||| el chico 
[X,1] ||| the boy [X,1] ||| lexprob=-3.14 lexicalized=1 numwords=2 count=17
+</code></pre>
+</div>
+
+<p>One file common to decoding is the glue grammar, which for hiero grammar is 
defined as follows:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[GOAL] ||| 
&lt;s&gt; ||| &lt;s&gt; ||| 0
+[GOAL] ||| [GOAL,1] [X,2] ||| [GOAL,1] [X,2] ||| -1
+[GOAL] ||| [GOAL,1] &lt;/s&gt; ||| [GOAL,1] &lt;/s&gt; ||| 0
+</code></pre>
+</div>
+
+<p>Joshua’s <a href="pipeline.html">pipeline</a> supports extraction of 
Hiero and SAMT grammars via
+<a href="thrax.html">Thrax</a> or GHKM grammars using <a 
href="http://www-nlp.stanford.edu/~mgalley/";>Michel Galley</a>’s
+GHKM extractor (included) or Moses’ GHKM extractor (if Moses is 
installed).</p>
+
+<h2 id="language-model">Language Model</h2>
+
+<p>Joshua has two language model implementations: <a 
href="http://kheafield.com/code/kenlm/";>KenLM</a> and
+<a href="http://berkeleylm.googlecode.com";>BerkeleyLM</a>.  All language model 
implementations support the
+standard ARPA format output by <a 
href="http://www.speech.sri.com/projects/srilm/";>SRILM</a>.  In addition,
+KenLM and BerkeleyLM support compiled formats that can be loaded more quickly 
and efficiently. KenLM
+is written in C++ and is supported via a JNI bridge, while BerkeleyLM is 
written in Java. KenLM is
+the default because of its support for left-state minimization.</p>
+
+<h3 id="compiling-for-kenlm">Compiling for KenLM</h3>
+
+<p>To compile an ARPA grammar for KenLM, use the (provided) <code 
class="highlighter-rouge">build-binary</code> command, located deep within
+the Joshua source code:</p>
+
+<div class="highlighter-rouge"><pre 
class="highlight"><code>$JOSHUA/bin/build_binary lm.arpa lm.kenlm
+</code></pre>
+</div>
+
+<p>This script takes the <code class="highlighter-rouge">lm.arpa</code> file 
and produces the compiled version in <code 
class="highlighter-rouge">lm.kenlm</code>.</p>
+
+<h3 id="compiling-for-berkeleylm">Compiling for BerkeleyLM</h3>
+
+<p>To compile a grammar for BerkeleyLM, type:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>java -cp 
$JOSHUA/lib/berkeleylm.jar -server -mxMEM 
edu.berkeley.nlp.lm.io.MakeLmBinaryFromArpa lm.arpa lm.berkeleylm
+</code></pre>
+</div>
+
+<p>The <code class="highlighter-rouge">lm.berkeleylm</code> file can then be 
listed directly in the <a href="decoder.html">Joshua configuration file</a>.</p>
+
+<h2 id="joshua-configuration-file">Joshua configuration file</h2>
+
+<p>The <a href="decoder.html">decoder page</a> documents decoder command-line 
and config file options.</p>
+
+<h2 id="thrax-configuration">Thrax configuration</h2>
+
+<p>See <a href="thrax.html">the thrax page</a> for more information about the 
Thrax configuration file.</p>
+
+
+          <!--   <h4 class="blog-post-title">Welcome to Joshua!</h4> -->
+
+          <!--   <p>This blog post shows a few different types of content 
that's supported and styled with Bootstrap. Basic typography, images, and code 
are all supported.</p> -->
+          <!--   <hr> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis <a href="#">dis 
parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque 
ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at 
lobortis. Cras mattis consectetur purus sit amet fermentum.</p> -->
+          <!--   <blockquote> -->
+          <!--     <p>Curabitur blandit tempus porttitor. <strong>Nullam quis 
risus eget urna mollis</strong> ornare vel eu leo. Nullam id dolor id nibh 
ultricies vehicula ut id elit.</p> -->
+          <!--   </blockquote> -->
+          <!--   <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. 
Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla 
sed consectetur.</p> -->
+          <!--   <h2>Heading</h2> -->
+          <!--   <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus 
dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, 
eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, 
vestibulum at eros.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</p> -->
+          <!--   <pre><code>Example code block</code></pre> -->
+          <!--   <p>Aenean lacinia bibendum nulla sed consectetur. Etiam porta 
sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, 
tortor mauris condimentum nibh, ut fermentum massa.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. 
Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus 
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet 
risus.</p> -->
+          <!--   <ul> -->
+          <!--     <li>Praesent commodo cursus magna, vel scelerisque nisl 
consectetur et.</li> -->
+          <!--     <li>Donec id elit non mi porta gravida at eget metus.</li> 
-->
+          <!--     <li>Nulla vitae elit libero, a pharetra augue.</li> -->
+          <!--   </ul> -->
+          <!--   <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla 
vitae elit libero, a pharetra augue.</p> -->
+          <!--   <ol> -->
+          <!--     <li>Vestibulum id ligula porta felis euismod semper.</li> 
-->
+          <!--     <li>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</li> -->
+          <!--     <li>Maecenas sed diam eget risus varius blandit sit amet 
non magna.</li> -->
+          <!--   </ol> -->
+          <!--   <p>Cras mattis consectetur purus sit amet fermentum. Sed 
posuere consectetur est at lobortis.</p> -->
+          <!-- </div><\!-- /.blog-post -\-> -->
+
+        </div>
+
+      </div><!-- /.row -->
+
+      
+        
+    </div><!-- /.container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- <script src="../../assets/js/docs.min.js"></script> -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <!-- <script 
src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+    -->
+
+    <!-- Start of StatCounter Code for Default Guide -->
+    <script type="text/javascript">
+      var sc_project=8264132; 
+      var sc_invisible=1; 
+      var sc_security="4b97fe2d"; 
+    </script>
+    <script type="text/javascript" 
src="http://www.statcounter.com/counter/counter.js";></script>
+    <noscript>
+      <div class="statcounter">
+        <a title="hit counter joomla" 
+           href="http://statcounter.com/joomla/";
+           target="_blank">
+          <img class="statcounter"
+               src="http://c.statcounter.com/8264132/0/4b97fe2d/1/";
+               alt="hit counter joomla" />
+        </a>
+      </div>
+    </noscript>
+    <!-- End of StatCounter Code for Default Guide -->
+  </body>
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/file-formats.md
----------------------------------------------------------------------
diff --git a/6.0/file-formats.md b/6.0/file-formats.md
deleted file mode 100644
index dbebe55..0000000
--- a/6.0/file-formats.md
+++ /dev/null
@@ -1,72 +0,0 @@
----
-layout: default6
-category: advanced
-title: Joshua file formats
----
-This page describes the formats of Joshua configuration and support files.
-
-## Translation models (grammars)
-
-Joshua supports two grammar file formats: a text-based version (also used by 
Hiero, shared by
-[cdec](), and supported by [hierarchical Moses]()), and an efficient
-[packed representation](packing.html) developed by [Juri 
Ganitkevich](http://cs.jhu.edu/~juri).
-
-Grammar rules follow this format.
-
-    [LHS] ||| SOURCE-SIDE ||| TARGET-SIDE ||| FEATURES
-    
-The source and target sides contain a mixture of terminals and nonterminals. 
The nonterminals are
-linked across sides by indices. There is no limit to the number of paired 
nonterminals in the rule
-or on the nonterminal labels (Joshua supports decoding with SAMT and GHKM 
grammars).
-
-    [X] ||| el chico [X,1] ||| the boy [X,1] ||| -3.14 0 2 17
-    [S] ||| el chico [VP,1] ||| the boy [VP,1] ||| -3.14 0 2 17
-    [VP] ||| [NP,1] [IN,2] [VB,3] ||| [VB,3] [IN,2] [NP,1] ||| 0.0019026637 
0.81322956
-
-The feature values can have optional labels, e.g.:
-
-    [X] ||| el chico [X,1] ||| the boy [X,1] ||| lexprob=-3.14 lexicalized=1 
numwords=2 count=17
-    
-One file common to decoding is the glue grammar, which for hiero grammar is 
defined as follows:
-
-    [GOAL] ||| <s> ||| <s> ||| 0
-    [GOAL] ||| [GOAL,1] [X,2] ||| [GOAL,1] [X,2] ||| -1
-    [GOAL] ||| [GOAL,1] </s> ||| [GOAL,1] </s> ||| 0
-
-Joshua's [pipeline](pipeline.html) supports extraction of Hiero and SAMT 
grammars via
-[Thrax](thrax.html) or GHKM grammars using [Michel 
Galley](http://www-nlp.stanford.edu/~mgalley/)'s
-GHKM extractor (included) or Moses' GHKM extractor (if Moses is installed).
-
-## Language Model
-
-Joshua has two language model implementations: 
[KenLM](http://kheafield.com/code/kenlm/) and
-[BerkeleyLM](http://berkeleylm.googlecode.com).  All language model 
implementations support the
-standard ARPA format output by 
[SRILM](http://www.speech.sri.com/projects/srilm/).  In addition,
-KenLM and BerkeleyLM support compiled formats that can be loaded more quickly 
and efficiently. KenLM
-is written in C++ and is supported via a JNI bridge, while BerkeleyLM is 
written in Java. KenLM is
-the default because of its support for left-state minimization.
-
-### Compiling for KenLM
-
-To compile an ARPA grammar for KenLM, use the (provided) `build-binary` 
command, located deep within
-the Joshua source code:
-
-    $JOSHUA/bin/build_binary lm.arpa lm.kenlm
-    
-This script takes the `lm.arpa` file and produces the compiled version in 
`lm.kenlm`.
-
-### Compiling for BerkeleyLM
-
-To compile a grammar for BerkeleyLM, type:
-
-    java -cp $JOSHUA/lib/berkeleylm.jar -server -mxMEM 
edu.berkeley.nlp.lm.io.MakeLmBinaryFromArpa lm.arpa lm.berkeleylm
-
-The `lm.berkeleylm` file can then be listed directly in the [Joshua 
configuration file](decoder.html).
-
-## Joshua configuration file
-
-The [decoder page](decoder.html) documents decoder command-line and config 
file options.
-
-## Thrax configuration
-
-See [the thrax page](thrax.html) for more information about the Thrax 
configuration file.

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/index.html
----------------------------------------------------------------------
diff --git a/6.0/index.html b/6.0/index.html
new file mode 100644
index 0000000..7392541
--- /dev/null
+++ b/6.0/index.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>Joshua Documentation | Joshua documentation</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/joshua6.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <div class="blog-masthead">
+      <div class="container">
+        <nav class="blog-nav">
+          <!-- <a class="blog-nav-item active" href="#">Joshua</a> -->
+          <a class="blog-nav-item" href="/">Joshua</a>
+          <!-- <a class="blog-nav-item" href="/6.0/whats-new.html">New 
features</a> -->
+          <a class="blog-nav-item" href="/language-packs/">Language packs</a>
+          <a class="blog-nav-item" href="/data/">Datasets</a>
+          <a class="blog-nav-item" href="/support/">Support</a>
+          <a class="blog-nav-item" href="/contributors.html">Contributors</a>
+        </nav>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <div class="row">
+
+        <div class="col-sm-2">
+          <div class="sidebar-module">
+            <!-- <h4>About</h4> -->
+            <center>
+            <img src="/images/joshua-logo-small.png" />
+            <p>Joshua machine translation toolkit</p>
+            </center>
+          </div>
+          <hr>
+          <center>
+            <a href="/releases/current/" target="_blank"><button 
class="button">Download Joshua 6.0.5</button></a>
+            <br />
+            <a href="/releases/runtime/" target="_blank"><button 
class="button">Runtime only version</button></a>
+            <p>Released November 5, 2015</p>
+          </center>
+          <hr>
+          <!-- <div class="sidebar-module"> -->
+          <!--   <span id="download"> -->
+          <!--     <a 
href="http://joshua-decoder.org/downloads/joshua-6.0.tgz";>Download</a> -->
+          <!--   </span> -->
+          <!-- </div> -->
+          <div class="sidebar-module">
+            <h4>Using Joshua</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/install.html">Installation</a></li>
+              <li><a href="/6.0/quick-start.html">Quick Start</a></li>
+            </ol>
+          </div>
+          <hr>
+          <div class="sidebar-module">
+            <h4>Building new models</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/pipeline.html">Pipeline</a></li>
+              <li><a href="/6.0/tutorial.html">Tutorial</a></li>
+              <li><a href="/6.0/faq.html">FAQ</a></li>
+            </ol>
+          </div>
+<!--
+          <div class="sidebar-module">
+            <h4>Phrase-based</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/phrase.html">Training</a></li>
+            </ol>
+          </div>
+-->
+          <hr>
+          <div class="sidebar-module">
+            <h4>Advanced</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/bundle.html">Building language packs</a></li>
+              <li><a href="/6.0/decoder.html">Decoder options</a></li>
+              <li><a href="/6.0/file-formats.html">File formats</a></li>
+              <li><a href="/6.0/packing.html">Packing TMs</a></li>
+              <li><a href="/6.0/large-lms.html">Building large LMs</a></li>
+            </ol>
+          </div>
+
+          <hr> 
+          <div class="sidebar-module">
+            <h4>Developer</h4>
+            <ol class="list-unstyled">              
+               <li><a 
href="https://github.com/joshua-decoder/joshua";>Github</a></li>
+               <li><a 
href="http://cs.jhu.edu/~post/joshua-docs";>Javadoc</a></li>
+               <li><a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Mailing
 list</a></li>              
+            </ol>
+          </div>
+
+        </div><!-- /.blog-sidebar -->
+
+        
+        <div class="col-sm-8 blog-main">
+        
+
+          <div class="blog-title">
+            <h2>Joshua documentation</h2>
+          </div>
+          
+          <div class="blog-post">
+
+            <p>This page contains end-user oriented documentation for the 6.0 
release of
+<a href="http://joshua-decoder.org/";>the Joshua decoder</a>.</p>
+
+<p>To navigate the documentation, use the links on the navigation bar to
+the left. For more detail on the decoder itself, including its command-line 
options, see
+<a href="decoder.html">the Joshua decoder page</a>.  You can also learn more 
about other steps of
+<a href="pipeline.html">the Joshua MT pipeline</a>, including <a 
href="thrax.html">grammar extraction</a> with Thrax and
+Joshua’s <a href="packing.html">efficient grammar representation</a>.</p>
+
+<p>A <a href="bundle.html">bundled configuration</a>, which is a minimal set 
of configuration, resource, and script files, can be created and easily 
transferred and shared.</p>
+
+<h2 id="development">Development</h2>
+
+<p>For developer support, please consult <a 
href="http://cs.jhu.edu/~post/joshua-docs";>the javadoc documentation</a> and 
the <a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Joshua
 developers mailing list</a>.</p>
+
+<h2 id="support">Support</h2>
+
+<p>If you have problems or issues, you might find some help <a 
href="faq.html">on our answers page</a> or
+<a href="https://groups.google.com/forum/?fromgroups#!forum/joshua_support";>in 
the mailing list archives</a>.</p>
+
+
+          <!--   <h4 class="blog-post-title">Welcome to Joshua!</h4> -->
+
+          <!--   <p>This blog post shows a few different types of content 
that's supported and styled with Bootstrap. Basic typography, images, and code 
are all supported.</p> -->
+          <!--   <hr> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis <a href="#">dis 
parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque 
ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at 
lobortis. Cras mattis consectetur purus sit amet fermentum.</p> -->
+          <!--   <blockquote> -->
+          <!--     <p>Curabitur blandit tempus porttitor. <strong>Nullam quis 
risus eget urna mollis</strong> ornare vel eu leo. Nullam id dolor id nibh 
ultricies vehicula ut id elit.</p> -->
+          <!--   </blockquote> -->
+          <!--   <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. 
Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla 
sed consectetur.</p> -->
+          <!--   <h2>Heading</h2> -->
+          <!--   <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus 
dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, 
eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, 
vestibulum at eros.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</p> -->
+          <!--   <pre><code>Example code block</code></pre> -->
+          <!--   <p>Aenean lacinia bibendum nulla sed consectetur. Etiam porta 
sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, 
tortor mauris condimentum nibh, ut fermentum massa.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. 
Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus 
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet 
risus.</p> -->
+          <!--   <ul> -->
+          <!--     <li>Praesent commodo cursus magna, vel scelerisque nisl 
consectetur et.</li> -->
+          <!--     <li>Donec id elit non mi porta gravida at eget metus.</li> 
-->
+          <!--     <li>Nulla vitae elit libero, a pharetra augue.</li> -->
+          <!--   </ul> -->
+          <!--   <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla 
vitae elit libero, a pharetra augue.</p> -->
+          <!--   <ol> -->
+          <!--     <li>Vestibulum id ligula porta felis euismod semper.</li> 
-->
+          <!--     <li>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</li> -->
+          <!--     <li>Maecenas sed diam eget risus varius blandit sit amet 
non magna.</li> -->
+          <!--   </ol> -->
+          <!--   <p>Cras mattis consectetur purus sit amet fermentum. Sed 
posuere consectetur est at lobortis.</p> -->
+          <!-- </div><\!-- /.blog-post -\-> -->
+
+        </div>
+
+      </div><!-- /.row -->
+
+      
+        
+    </div><!-- /.container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- <script src="../../assets/js/docs.min.js"></script> -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <!-- <script 
src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+    -->
+
+    <!-- Start of StatCounter Code for Default Guide -->
+    <script type="text/javascript">
+      var sc_project=8264132; 
+      var sc_invisible=1; 
+      var sc_security="4b97fe2d"; 
+    </script>
+    <script type="text/javascript" 
src="http://www.statcounter.com/counter/counter.js";></script>
+    <noscript>
+      <div class="statcounter">
+        <a title="hit counter joomla" 
+           href="http://statcounter.com/joomla/";
+           target="_blank">
+          <img class="statcounter"
+               src="http://c.statcounter.com/8264132/0/4b97fe2d/1/";
+               alt="hit counter joomla" />
+        </a>
+      </div>
+    </noscript>
+    <!-- End of StatCounter Code for Default Guide -->
+  </body>
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/index.md
----------------------------------------------------------------------
diff --git a/6.0/index.md b/6.0/index.md
deleted file mode 100644
index 898464a..0000000
--- a/6.0/index.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: default6
-title: Joshua documentation
----
-
-This page contains end-user oriented documentation for the 6.0 release of
-[the Joshua decoder](http://joshua-decoder.org/).
-
-To navigate the documentation, use the links on the navigation bar to
-the left. For more detail on the decoder itself, including its command-line 
options, see
-[the Joshua decoder page](decoder.html).  You can also learn more about other 
steps of
-[the Joshua MT pipeline](pipeline.html), including [grammar 
extraction](thrax.html) with Thrax and
-Joshua's [efficient grammar representation](packing.html).
-
-A [bundled configuration](bundle.html), which is a minimal set of 
configuration, resource, and script files, can be created and easily 
transferred and shared.
-
-## Development
-
-For developer support, please consult [the javadoc 
documentation](http://cs.jhu.edu/~post/joshua-docs) and the [Joshua developers 
mailing 
list](https://groups.google.com/forum/?fromgroups#!forum/joshua_developers).
-
-## Support
-
-If you have problems or issues, you might find some help [on our answers 
page](faq.html) or
-[in the mailing list 
archives](https://groups.google.com/forum/?fromgroups#!forum/joshua_support).

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/install.html
----------------------------------------------------------------------
diff --git a/6.0/install.html b/6.0/install.html
new file mode 100644
index 0000000..b972e81
--- /dev/null
+++ b/6.0/install.html
@@ -0,0 +1,301 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>Joshua Documentation | Installation</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/joshua6.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+    <div class="blog-masthead">
+      <div class="container">
+        <nav class="blog-nav">
+          <!-- <a class="blog-nav-item active" href="#">Joshua</a> -->
+          <a class="blog-nav-item" href="/">Joshua</a>
+          <!-- <a class="blog-nav-item" href="/6.0/whats-new.html">New 
features</a> -->
+          <a class="blog-nav-item" href="/language-packs/">Language packs</a>
+          <a class="blog-nav-item" href="/data/">Datasets</a>
+          <a class="blog-nav-item" href="/support/">Support</a>
+          <a class="blog-nav-item" href="/contributors.html">Contributors</a>
+        </nav>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <div class="row">
+
+        <div class="col-sm-2">
+          <div class="sidebar-module">
+            <!-- <h4>About</h4> -->
+            <center>
+            <img src="/images/joshua-logo-small.png" />
+            <p>Joshua machine translation toolkit</p>
+            </center>
+          </div>
+          <hr>
+          <center>
+            <a href="/releases/current/" target="_blank"><button 
class="button">Download Joshua 6.0.5</button></a>
+            <br />
+            <a href="/releases/runtime/" target="_blank"><button 
class="button">Runtime only version</button></a>
+            <p>Released November 5, 2015</p>
+          </center>
+          <hr>
+          <!-- <div class="sidebar-module"> -->
+          <!--   <span id="download"> -->
+          <!--     <a 
href="http://joshua-decoder.org/downloads/joshua-6.0.tgz";>Download</a> -->
+          <!--   </span> -->
+          <!-- </div> -->
+          <div class="sidebar-module">
+            <h4>Using Joshua</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/install.html">Installation</a></li>
+              <li><a href="/6.0/quick-start.html">Quick Start</a></li>
+            </ol>
+          </div>
+          <hr>
+          <div class="sidebar-module">
+            <h4>Building new models</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/pipeline.html">Pipeline</a></li>
+              <li><a href="/6.0/tutorial.html">Tutorial</a></li>
+              <li><a href="/6.0/faq.html">FAQ</a></li>
+            </ol>
+          </div>
+<!--
+          <div class="sidebar-module">
+            <h4>Phrase-based</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/phrase.html">Training</a></li>
+            </ol>
+          </div>
+-->
+          <hr>
+          <div class="sidebar-module">
+            <h4>Advanced</h4>
+            <ol class="list-unstyled">
+              <li><a href="/6.0/bundle.html">Building language packs</a></li>
+              <li><a href="/6.0/decoder.html">Decoder options</a></li>
+              <li><a href="/6.0/file-formats.html">File formats</a></li>
+              <li><a href="/6.0/packing.html">Packing TMs</a></li>
+              <li><a href="/6.0/large-lms.html">Building large LMs</a></li>
+            </ol>
+          </div>
+
+          <hr> 
+          <div class="sidebar-module">
+            <h4>Developer</h4>
+            <ol class="list-unstyled">              
+               <li><a 
href="https://github.com/joshua-decoder/joshua";>Github</a></li>
+               <li><a 
href="http://cs.jhu.edu/~post/joshua-docs";>Javadoc</a></li>
+               <li><a 
href="https://groups.google.com/forum/?fromgroups#!forum/joshua_developers";>Mailing
 list</a></li>              
+            </ol>
+          </div>
+
+        </div><!-- /.blog-sidebar -->
+
+        
+        <div class="col-sm-8 blog-main">
+        
+
+          <div class="blog-title">
+            <h2>Installation</h2>
+          </div>
+          
+          <div class="blog-post">
+
+            <h3 id="download-and-install">Download and install</h3>
+
+<p>To use Joshua as a standalone decoder (with <a 
href="/language-packs/">language packs</a>), you only need to download and 
install the runtime version of the decoder. 
+If you also wish to build translation models from your own data, you will want 
to install the full version.
+See the instructions below.</p>
+
+<ol>
+  <li>
+    <p>Set up some basic environment variables. 
+You need to define <code class="highlighter-rouge">$JAVA_HOME</code></p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>export 
JAVA_HOME=/path/to/java
+
+# JAVA_HOME is not very standardized. Here are some places to look:
+# OS X:  export 
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home
+# Linux: export JAVA_HOME=/usr/java/default
+</code></pre>
+    </div>
+  </li>
+  <li>
+    <p>If you are installing the full version of Joshua, you also need to 
define <code class="highlighter-rouge">$HADOOP</code> to point to your Hadoop 
installation.
+(Joshua looks for the Hadoop executuble in <code 
class="highlighter-rouge">$HADOOP/bin/hadoop</code>)</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>export 
HADOOP=/usr
+</code></pre>
+    </div>
+
+    <p>If you don’t have a Hadoop installation, <a 
href="pipeline.html">Joshua’s pipeline</a> can install a standalone version 
for you.</p>
+  </li>
+  <li>
+    <p>To install just the runtime version of Joshua, type</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>wget -q 
http://cs.jhu.edu/~post/files/joshua-runtime-6.0.5.tgz
+</code></pre>
+    </div>
+
+    <p>Then build everything</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>tar xzf 
joshua-runtime-6.0.5.tgz
+cd joshua-runtime-6.0.5
+
+# Add this to your init files
+export JOSHUA=$(pwd)
+   
+# build everything
+ant
+</code></pre>
+    </div>
+  </li>
+  <li>
+    <p>To instead install the full version, type</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>wget -q 
http://cs.jhu.edu/~post/files/joshua-6.0.5.tgz
+
+tar xzf joshua-6.0.5.tgz
+cd joshua-6.0.5
+
+# Add this to your init files
+export JOSHUA=$(pwd)
+   
+# build everything
+ant
+</code></pre>
+    </div>
+  </li>
+</ol>
+
+<h3 id="building-new-models">Building new models</h3>
+
+<p>If you wish to build models for new language pairs from existing data (such 
as the <a href="http://statmt.org/wmt14/";>WMT data</a>), you need to install 
some additional dependencies.</p>
+
+<ol>
+  <li>
+    <p>For learning hierarchical models, Joshua includes a tool called <a 
href="thrax.html">Thrax</a>, which
+is built on Hadoop. If you have a Hadoop installation, make sure that the 
environment variable
+<code class="highlighter-rouge">$HADOOP</code> is set and points to it. If you 
don’t, Joshua will roll one out for you in standalone
+mode. Hadoop is only needed if you plan to build new models with Joshua.</p>
+  </li>
+  <li>
+    <p>You will need to install Moses if either of the following applies to 
you:</p>
+
+    <ul>
+      <li>
+        <p>You wish to build <a href="phrase.html">phrase-based models</a> 
(Joshua 6 includes a phrase-based
+decoder, but not the tools for building such a model)</p>
+      </li>
+      <li>
+        <p>You are building your own models (phrase- or syntax-based) and wish 
to use Cherry &amp; Foster’s
+<a href="http://aclweb.org/anthology-new/N/N12/N12-1047v2.pdf";>batch MIRA 
tuner</a> instead of the included
+MERT implementation, <a href="zmert.html">Z-MERT</a>. </p>
+      </li>
+    </ul>
+
+    <p>Follow <a 
href="http://www.statmt.org/moses/?n=Development.GetStarted";>the instructions 
for installing Moses
+here</a>, and then define the <code class="highlighter-rouge">$MOSES</code>
+environment variable to point to the root of the Moses installation.</p>
+  </li>
+</ol>
+
+<h2 id="more-information">More information</h2>
+
+<p>For more detail on the decoder itself, including its command-line options, 
see
+<a href="decoder.html">the Joshua decoder page</a>.  You can also learn more 
about other steps of
+<a href="pipeline.html">the Joshua MT pipeline</a>, including <a 
href="thrax.html">grammar extraction</a> with Thrax and
+Joshua’s <a href="packing.html">efficient grammar representation</a>.</p>
+
+<p>If you have problems or issues, you might find some help <a 
href="faq.html">on our answers page</a> or
+<a href="https://groups.google.com/forum/?fromgroups#!forum/joshua_support";>in 
the mailing list archives</a>.</p>
+
+<p>A <a href="bundle.html">bundled configuration</a>, which is a minimal set 
of configuration, resource, and script files, can be created and easily 
transferred and shared.</p>
+
+
+          <!--   <h4 class="blog-post-title">Welcome to Joshua!</h4> -->
+
+          <!--   <p>This blog post shows a few different types of content 
that's supported and styled with Bootstrap. Basic typography, images, and code 
are all supported.</p> -->
+          <!--   <hr> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis <a href="#">dis 
parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque 
ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at 
lobortis. Cras mattis consectetur purus sit amet fermentum.</p> -->
+          <!--   <blockquote> -->
+          <!--     <p>Curabitur blandit tempus porttitor. <strong>Nullam quis 
risus eget urna mollis</strong> ornare vel eu leo. Nullam id dolor id nibh 
ultricies vehicula ut id elit.</p> -->
+          <!--   </blockquote> -->
+          <!--   <p>Etiam porta <em>sem malesuada magna</em> mollis euismod. 
Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla 
sed consectetur.</p> -->
+          <!--   <h2>Heading</h2> -->
+          <!--   <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus 
dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, 
eget lacinia odio sem nec elit. Morbi leo risus, porta ac consectetur ac, 
vestibulum at eros.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</p> -->
+          <!--   <pre><code>Example code block</code></pre> -->
+          <!--   <p>Aenean lacinia bibendum nulla sed consectetur. Etiam porta 
sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, 
tortor mauris condimentum nibh, ut fermentum massa.</p> -->
+          <!--   <h3>Sub-heading</h3> -->
+          <!--   <p>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. 
Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus 
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet 
risus.</p> -->
+          <!--   <ul> -->
+          <!--     <li>Praesent commodo cursus magna, vel scelerisque nisl 
consectetur et.</li> -->
+          <!--     <li>Donec id elit non mi porta gravida at eget metus.</li> 
-->
+          <!--     <li>Nulla vitae elit libero, a pharetra augue.</li> -->
+          <!--   </ul> -->
+          <!--   <p>Donec ullamcorper nulla non metus auctor fringilla. Nulla 
vitae elit libero, a pharetra augue.</p> -->
+          <!--   <ol> -->
+          <!--     <li>Vestibulum id ligula porta felis euismod semper.</li> 
-->
+          <!--     <li>Cum sociis natoque penatibus et magnis dis parturient 
montes, nascetur ridiculus mus.</li> -->
+          <!--     <li>Maecenas sed diam eget risus varius blandit sit amet 
non magna.</li> -->
+          <!--   </ol> -->
+          <!--   <p>Cras mattis consectetur purus sit amet fermentum. Sed 
posuere consectetur est at lobortis.</p> -->
+          <!-- </div><\!-- /.blog-post -\-> -->
+
+        </div>
+
+      </div><!-- /.row -->
+
+      
+        
+    </div><!-- /.container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script 
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js";></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- <script src="../../assets/js/docs.min.js"></script> -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <!-- <script 
src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+    -->
+
+    <!-- Start of StatCounter Code for Default Guide -->
+    <script type="text/javascript">
+      var sc_project=8264132; 
+      var sc_invisible=1; 
+      var sc_security="4b97fe2d"; 
+    </script>
+    <script type="text/javascript" 
src="http://www.statcounter.com/counter/counter.js";></script>
+    <noscript>
+      <div class="statcounter">
+        <a title="hit counter joomla" 
+           href="http://statcounter.com/joomla/";
+           target="_blank">
+          <img class="statcounter"
+               src="http://c.statcounter.com/8264132/0/4b97fe2d/1/";
+               alt="hit counter joomla" />
+        </a>
+      </div>
+    </noscript>
+    <!-- End of StatCounter Code for Default Guide -->
+  </body>
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-joshua-site/blob/53cc3005/6.0/install.md
----------------------------------------------------------------------
diff --git a/6.0/install.md b/6.0/install.md
deleted file mode 100644
index 87e0079..0000000
--- a/6.0/install.md
+++ /dev/null
@@ -1,88 +0,0 @@
----
-layout: default6
-title: Installation
----
-
-### Download and install
-
-To use Joshua as a standalone decoder (with [language 
packs](/language-packs/)), you only need to download and install the runtime 
version of the decoder. 
-If you also wish to build translation models from your own data, you will want 
to install the full version.
-See the instructions below.
-
-1.  Set up some basic environment variables. 
-    You need to define `$JAVA_HOME`
-
-        export JAVA_HOME=/path/to/java
-
-        # JAVA_HOME is not very standardized. Here are some places to look:
-        # OS X:  export 
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home
-        # Linux: export JAVA_HOME=/usr/java/default
-
-1.  If you are installing the full version of Joshua, you also need to define 
`$HADOOP` to point to your Hadoop installation.
-    (Joshua looks for the Hadoop executuble in `$HADOOP/bin/hadoop`)
-
-        export HADOOP=/usr
-
-    If you don't have a Hadoop installation, [Joshua's 
pipeline](pipeline.html) can install a standalone version for you.
-    
-1.  To install just the runtime version of Joshua, type
-
-        wget -q http://cs.jhu.edu/~post/files/joshua-runtime-{{ 
site.data.joshua.release_version }}.tgz
-
-    Then build everything
-
-        tar xzf joshua-runtime-{{ site.data.joshua.release_version }}.tgz
-        cd joshua-runtime-{{ site.data.joshua.release_version }}
-
-        # Add this to your init files
-        export JOSHUA=$(pwd)
-       
-        # build everything
-        ant
-
-1.  To instead install the full version, type
-
-        wget -q http://cs.jhu.edu/~post/files/joshua-{{ 
site.data.joshua.release_version }}.tgz
-
-        tar xzf joshua-{{ site.data.joshua.release_version }}.tgz
-        cd joshua-{{ site.data.joshua.release_version }}
-
-        # Add this to your init files
-        export JOSHUA=$(pwd)
-       
-        # build everything
-        ant
-
-### Building new models
-
-If you wish to build models for new language pairs from existing data (such as 
the [WMT data](http://statmt.org/wmt14/)), you need to install some additional 
dependencies.
-
-1. For learning hierarchical models, Joshua includes a tool called 
[Thrax](thrax.html), which
-is built on Hadoop. If you have a Hadoop installation, make sure that the 
environment variable
-`$HADOOP` is set and points to it. If you don't, Joshua will roll one out for 
you in standalone
-mode. Hadoop is only needed if you plan to build new models with Joshua.
-
-1. You will need to install Moses if either of the following applies to you:
-
-    - You wish to build [phrase-based models](phrase.html) (Joshua 6 includes 
a phrase-based
-      decoder, but not the tools for building such a model)
-
-    - You are building your own models (phrase- or syntax-based) and wish to 
use Cherry & Foster's
-[batch MIRA tuner](http://aclweb.org/anthology-new/N/N12/N12-1047v2.pdf) 
instead of the included
-MERT implementation, [Z-MERT](zmert.html). 
-
-    Follow [the instructions for installing Moses
-here](http://www.statmt.org/moses/?n=Development.GetStarted), and then define 
the `$MOSES`
-environment variable to point to the root of the Moses installation.
-
-## More information
-
-For more detail on the decoder itself, including its command-line options, see
-[the Joshua decoder page](decoder.html).  You can also learn more about other 
steps of
-[the Joshua MT pipeline](pipeline.html), including [grammar 
extraction](thrax.html) with Thrax and
-Joshua's [efficient grammar representation](packing.html).
-
-If you have problems or issues, you might find some help [on our answers 
page](faq.html) or
-[in the mailing list 
archives](https://groups.google.com/forum/?fromgroups#!forum/joshua_support).
-
-A [bundled configuration](bundle.html), which is a minimal set of 
configuration, resource, and script files, can be created and easily 
transferred and shared.

Reply via email to