Skip to content

Commit

Permalink
Bumped version to 1.4b1. updated links to documentation.
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentj committed Jun 9, 2012
1 parent fb56dc5 commit 6ec9879
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -17,13 +17,13 @@ See [the download page](http://jelix.org/articles/en/download).

Jelix is compatible only with PHP 5.2 or more.

Read [the first chapter of the manual to install Jelix and to create an application](http://jelix.org/articles/en/manual-1.3/getting-started)
Read [the first chapter of the manual to install Jelix and to create an application](http://docs.jelix.org/en/manual-1.4/getting-started)

Documentation and community
===========================

You have a full manual to learn Jelix. You can read it [direcly on the website](http://jelix.org/articles/en/manual-1.3),
or you can [download the PDF edition](http://prdownload.berlios.de/jelix/manual-jelix-1.3b1.pdf).
You have a full manual to learn Jelix. You can read it [direcly on the website](http://docs.jelix.org/en/manual-1.4),
or you can [download the PDF edition](http://download.jelix.org/jelix/documentation/en/manual-jelix-1.3.1.pdf).

You can ask your questions [on the forum](http://jelix.org/forums/cat/2-english) or
You can ask your questions [on the forum](http://jelix.org/forums/forum/cat/2-english) or
on our IRC Channel, #jelix, on the irc.freenode.net network.
2 changes: 1 addition & 1 deletion lib/jelix-scripts/templates/htaccess_allow
Expand Up @@ -2,7 +2,7 @@ allow from all

# uncomment these lines if you want to remove the index.php from the url
# with the basic_significant or significant url engine of jelix
# see http://jelix.org/articles/en/manual-1.2/urls/significant#mod_rewrite-and-just-removing-the-name-of-the-entry-point-in-the-url
# see http://docs.jelix.org/en/manual-1.4/urls/significant#mod_rewrite-and-just-removing-the-name-of-the-entry-point-in-the-url
#<IfModule mod_rewrite.c>
# RewriteEngine On
# RewriteBase /
Expand Down
4 changes: 2 additions & 2 deletions lib/jelix/INSTALL
Expand Up @@ -25,5 +25,5 @@ installation
Details
-------

see http://jelix.org/articles/fr/manuel-1.3/mise-en-route
or http://jelix.org/articles/en/manual-1.3/getting-started
see http://docs.jelix.org/fr/manuel-1.4/mise-en-route
or http://docs.jelix.org/en/manual-1.4/getting-started
2 changes: 1 addition & 1 deletion lib/jelix/VERSION
@@ -1 +1 @@
1.4pre.SERIAL
1.4b1
Expand Up @@ -16,7 +16,7 @@
<p>If you want to use another name for the Jelix's web file directory,
modify the <code>jelixWWWPath</code> parameter in
<em>{$configpath}defaultconfig.ini.php</em>.</p>
<p>For more informations, see <a href="http://jelix.org/articles/en/manual-1.3/server-configuration"
<p>For more informations, see <a href="http://docs.jelix.org/en/manual-1.4/server-configuration"
title="installation documentation">the installation documentation</a> of Jelix.</p>
<hr />
</div>
Expand All @@ -43,8 +43,8 @@
<ul>
<li><a href="http://www.jelix.org">Visit the Official Jelix's site</a></li>
<li><a href="http://jelix.org/articles/en/tutorials">Learn with tutorials</a></li>
<li><a href="http://jelix.org/articles/en/manual-1.3">Read the documentation of Jelix</a></li>
<li><a href="http://jelix.org/forums/cat/2-english">Ask your questions in forums</a></li>
<li><a href="http://docs.jelix.org/en/manual-1.4">Read the documentation of Jelix</a></li>
<li><a href="http://jelix.org/forums/forum/cat/2-english">Ask your questions in forums</a></li>
</ul>
</div>
</div>
Expand Down
Expand Up @@ -16,7 +16,7 @@
<p>If you want to use another name for the Jelix's web file directory,
modify the <code>jelixWWWPath</code> parameter in
<em>{$configpath}defaultconfig.ini.php</em>.</p>
<p>For more informations, see <a href="http://jelix.org/articles/en/manual-1.3/server-configuration"
<p>For more informations, see <a href="http://docs.jelix.org/en/manual-1.4/server-configuration"
title="installation documentation">the installation documentation</a> of Jelix.</p>
<hr />
</div>
Expand All @@ -43,8 +43,8 @@
<ul>
<li><a href="http://www.jelix.org">Visit the Official Jelix's site</a></li>
<li><a href="http://jelix.org/articles/en/tutorials">Learn with tutorials</a></li>
<li><a href="http://jelix.org/articles/en/manual-1.3">Read the documentation of Jelix</a></li>
<li><a href="http://jelix.org/forums/cat/2-english">Ask your questions in forums</a></li>
<li><a href="http://docs.jelix.org/en/manual-1.4">Read the documentation of Jelix</a></li>
<li><a href="http://jelix.org/forums/forum/cat/2-english">Ask your questions in forums</a></li>
</ul>
</div>
</div>
Expand Down
Expand Up @@ -17,7 +17,7 @@
modifier le paramêtre <code>jelixWWWPath</code>
dans <em>{$configpath}defaultconfig.ini.php</em>.</p>
<p>Pour plus d'informations, consultez
<a href="http://jelix.org/articles/fr/manuel-1.3/configurer-server"
<a href="http://docs.jelix.org/fr/manuel-1.4/configurer-server"
title="documentation officielle">la documentation sur l'installation de Jelix</a>.</p>
<hr />
</div>
Expand Down Expand Up @@ -45,8 +45,8 @@
<ul>
<li><a href="http://jelix.org" title="Site officiel de Jelix">Visitez le site de Jelix</a></li>
<li><a href="http://jelix.org/articles/fr/tutoriels">Suivez les tutoriels</a></li>
<li><a href="http://jelix.org/articles/fr/manuel-1.3">Lisez la documentation de Jelix</a></li>
<li><a href="http://jelix.org/forums/cat/1-francais">Posez vos questions dans les forums</a></li>
<li><a href="http://docs.jelix.org/fr/manuel-1.4">Lisez la documentation de Jelix</a></li>
<li><a href="http://jelix.org/forums/forum/cat/1-francais">Posez vos questions dans les forums</a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion testapp/VERSION
@@ -1 +1 @@
1.4pre.SERIAL
1.4b1

0 comments on commit 6ec9879

Please sign in to comment.