[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 9ad083429ad1ea1688102664ef06897a2f6b744f
The branch, master has been updated via 9ad083429ad1ea1688102664ef06897a2f6b744f (commit) via b7f4f7eb75239001c4ba3e457c9718305be89b72 (commit) via 717fb2040aaed447ae039e5c899bcce3f0c9aa83 (commit) from dbbe02a82cff327cc10714468f2798f886cd0428 (commit)
- Log ----------------------------------------------------------------- commit 9ad083429ad1ea1688102664ef06897a2f6b744f Author: Michal Čihař mcihar@novell.com Date: Thu Mar 11 13:38:24 2010 +0100
Move contribution hints to Git.
commit b7f4f7eb75239001c4ba3e457c9718305be89b72 Author: Michal Čihař mcihar@novell.com Date: Thu Mar 11 13:35:03 2010 +0100
Snapshots will be from Git.
commit 717fb2040aaed447ae039e5c899bcce3f0c9aa83 Author: Michal Čihař mcihar@novell.com Date: Thu Mar 11 13:34:10 2010 +0100
Mention Git repository instead of SVN.
-----------------------------------------------------------------------
Summary of changes: templates/_gitdl.tpl | 10 ++++++++ templates/_svndl.tpl | 10 -------- templates/downloads.tpl | 4 +- templates/improve.tpl | 59 ++++++++++------------------------------------ 4 files changed, 25 insertions(+), 58 deletions(-) create mode 100644 templates/_gitdl.tpl delete mode 100644 templates/_svndl.tpl
diff --git a/templates/_gitdl.tpl b/templates/_gitdl.tpl new file mode 100644 index 0000000..e3b48c4 --- /dev/null +++ b/templates/_gitdl.tpl @@ -0,0 +1,10 @@ +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + +<p> +Git repositories are located at +<code>git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/REPONAME</code> and you +can browse them online using <a +href="http://phpmyadmin.git.sourceforge.net/%22%3EGit web</a>. +</p> + +</html> diff --git a/templates/_svndl.tpl b/templates/_svndl.tpl deleted file mode 100644 index e62020e..0000000 --- a/templates/_svndl.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> - -<p> -Subversion repository is located at -<code>https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin</code> and you -can browse it online using <a -href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/%22%3EViewVC</a>. -</p> - -</html> diff --git a/templates/downloads.tpl b/templates/downloads.tpl index 4b6c9db..b9f9ef8 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -38,10 +38,10 @@ </py:for>
<h2>Development Versions</h2> - <xi:include href="_svndl.tpl" /> + <xi:include href="_gitdl.tpl" />
<p> - Below are listed SVN snapshots for trunk branch, more daily snapshots of the + Below are listed Git snapshots for trunk branch, more daily snapshots of the code are available on <a href="http://cihar.com/phpMyAdmin/snapshots/">external server</a>. </p> diff --git a/templates/improve.tpl b/templates/improve.tpl index d2fdb21..01e98c0 100644 --- a/templates/improve.tpl +++ b/templates/improve.tpl @@ -64,29 +64,21 @@ jobs</a> where you can find some tips where to look. </p>
<h3>Source Code Repository</h3> -<xi:include href="_svndl.tpl" /> +<xi:include href="_gitdl.tpl" />
<p> -To start development you want to start with <code>trunk/phpMyAdmin</code>, -where the current development version of phpMyAdmin is stored. Other interesting -parts of repository include: +To start development you want to start with <code>phpmyadmin</code> repository. +Full list of repositories include: </p>
<dl class="cvslist"> -<dt>trunk/</dt><dd>Current development version of all code.</dd> -<dt>trunk/phpMyAdmin</dt><dd>phpMyAdmin code.</dd> -<dt>trunk/website</dt><dd>Website code.</dd> -<dt>trunk/themes</dt><dd>Themes.</dd> -<dt>trunk/data</dt><dd>Various project related data (such as logos, T-shirt graphics, etc.).</dd> -<dt>trunk/history</dt><dd>Some historical documents (old changelogs or website).</dd> -<dt>trunk/planet</dt><dd><a href="http://planet.phpmyadmin.net/">Planet phpMyAdmin</a> configuration.</dd> -<dt>trunk/localized_docs</dt><dd>Not used anymore, see Git section bellow.</dd> -<dt>tags/</dt><dd>Tags for all released versions (as <code>RELEASE_X_Y_Z</code>)</dd> -<dt>tags/STABLE</dt><dd>Special moving tag which always contains latest -released stable version</dd> -<dt>tags/TESTING</dt><dd>Special moving tag which always contains latest -released testing version</dd> -<dt>branches/</dt><dd>Maintenance branches for older versions (as <code>QA_X_Y</code>)</dd> +<dt>phpmyadmin</dt><dd>phpMyAdmin code.</dd> +<dt>website</dt><dd>Website code.</dd> +<dt>themes</dt><dd>Themes.</dd> +<dt>data</dt><dd>Various project related data (such as logos, T-shirt graphics, etc.).</dd> +<dt>history</dt><dd>Some historical documents (old changelogs or website).</dd> +<dt>planet</dt><dd><a href="http://planet.phpmyadmin.net/">Planet phpMyAdmin</a> configuration.</dd> +<dt>localized_docs</dt><dd>Not used anymore, see Git section bellow.</dd> </dl>
<p> @@ -95,40 +87,15 @@ Examples of how to checkout phpMyAdmin code:
<pre> # Latest development version: -svn checkout https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin phpMyAdmin-dev -# Latest stable version: -svn checkout https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/tags/STABLE/phpMyA... phpMyAdmin-stable +git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin </pre>
-<h3>Git Repository</h3> - -<p> -phpMyAdmin is currently considering to switch development to Git. These -repositories do not yet contain current code are used mostly for testing. -</p> - -<p> -Git repository are located at -<code>git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/</code> and you -can browse it online using <a -href="http://phpmyadmin.git.sourceforge.net/git/gitweb-index.cgi%22%3EGitweb</a>. -</p> - -<p> -Following repositories are already used for development: -</p> - -<dl class="cvslist"> -<dt>localized_docs</dt><dd>Localized documentation.</dd> -</dl> - <h3>Repository Statistics</h3> <p>Several analyses of the repository are available:</p> <ul> -<li><a href="http://www.phpmyadmin.net/svnstats/">mpy-svn-stats</a></li> <li><a href="http://cia.vc/stats/project/phpmyadmin/">CIA.vc</a></li> <li><a href="http://www.ohloh.net/projects/phpmyadmin">Ohloh</a></li> -<li><a href="https://sourceforge.net/project/stats/detail.php?group_id=23067&ugn=phpmyadmin&type=svn">SourceForge.net</a></li> +<li><a href="https://sourceforge.net/project/stats/detail.php?group_id=23067&ugn=phpmyadmin&type=git">SourceForge.net</a></li> </ul>
<h3>Coding Standards</h3> @@ -162,7 +129,7 @@ href="http://wiki.phpmyadmin.net/pma/FAQ_7.2%22%3EFAQ 7.2</a>. Documentation is being translated using po4a and gettext (see <a href="${base_url}docs.${file_ext}">documentation</a> for existing translations). To start, checkout <code><a -href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/trunk/localized_docs...</a></code> from SVN, or +href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_...</a></code> from Git, or just go to <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a> and translate it online. If your language is missing, just contact <a href="mailto:michal@cihar.com">Michal Čihař</a>, he will add it. If you
hooks/post-receive
-
Michal Čihař