Skip to content

Commit

Permalink
Update install.xhp to say to use composer
Browse files Browse the repository at this point in the history
Closes #471
  • Loading branch information
SiebelsTim committed Jan 29, 2015
1 parent 5fe9985 commit 15e0450
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion __docs/phpdoc/doc-base/entities/global.ent
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
<!ENTITY url.xchm "http://xchm.sourceforge.net/">
<!ENTITY url.xdebug "http://xdebug.org/">
<!ENTITY url.xdiff "http://www.xmailserver.org/xdiff-lib.html">
<!ENTITY url.xhp "https://github.com/facebook/xhp/tree/master/php-lib">
<!ENTITY url.xhp "https://github.com/facebook/xhp">
<!ENTITY url.xhprof.docs.facebook "http://web.archive.org/web/20110514095512/http://mirror.facebook.net/facebook/xhprof/doc.html">
<!ENTITY url.xhprof.gui.fork1 "http://github.com/preinheimer/xhprof">
<!ENTITY url.xinclude.spec "http://www.w3.org/TR/xinclude/">
Expand Down
10 changes: 6 additions & 4 deletions __docs/phpdoc/en/install/xhp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ Fatal error: Class undefined: xhp_html in /
you need to include the XHP library in your project.
</para>
<para>
You can find the XHP library in <link xlink:href="&url.xhp;">Github</link>. Put the files found here somewhere in your source tree.
You can find the XHP library in <link xlink:href="&url.xhp;">Github</link>. Add the following lines to your <literal>composer.json</literal> to install the library.
<programlisting>
"require": {
"facebook/xhp-lib": "dev-master"
}
</programlisting>
</para>
<para>
Finally, either (1) change the XHP files from <literal>&lt;?php</literal> to <literal>&lt;?hh // decl</literal> (since XHP class name is supported out of the box in Hack) or (2) set <literal>hhvm.eval.enable_xhp=true</literal> in your <literal>.ini</literal> file or directly on the command line when running HHVM.
</para>
<para>
Finally <literal>include init.php;</literal> before you use any XHP functionality.
</para>
</chapter>

<!-- Keep this comment at the end of the file
Expand Down

0 comments on commit 15e0450

Please sign in to comment.