From 75ef0fde825b89a6c2fa41a723b600552921e214 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 13 Oct 2011 17:43:59 +0200 Subject: [PATCH] [ticket/10246] Move coding guidelines VCS section to wiki The VCS section can now be found at: * http://wiki.phpbb.com/Git#Branches PHPBB3-10246 --- phpBB/docs/coding-guidelines.html | 52 +------------------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index cd3c09f6fb..da7a3bf582 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -87,12 +87,6 @@
  • Writing Style
    • -
  • VCS Guidelines -
      -
    1. Repository structure
      2. -
    2. Commit Messages and Repository Rules
      3. -
    -
  • Copyright and disclaimer
    • @@ -2323,51 +2317,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
    -

    7. VCS Guidelines

    - -
    -
    - -
    - -

    The version control system for phpBB3 is git. The repository is available at http://github.com/phpbb/phpbb3.

    - -

    7.i. Repository Structure

    - -
      -
    • develop
      The latest unstable development version with new features etc.
      • -
    • develop-*
      Development branches of stable phpBB releases. Branched off of develop at the time of feature freeze. -
        -
      • phpBB3.0develop-olympus
        Development branch of the stable 3.0 line. Bug fixes are applied here.
        • -
      • phpBB3.1develop-ascraeus
        Development branch of the stable 3.1 line. Bug fixes are applied here.
        • -
      -
      • -
    • master
      A branch containing all stable phpBB3 release points
      • -
    • tags
      Released versions. Stable ones get merged into the master branch. -
        -
      • release-3.Y-BX
        Beta release X of the 3.Y line.
        • -
      • release-3.Y-RCX
        Release candidate X of the 3.Y line.
        • -
      • release-3.Y.Z-RCX
        Release candidate X of the stable 3.Y.Z release.
        • -
      • release-3.0.X
        Stable 3.0.X release.
        • -
      • release-2.0.X
        Old stable 2.0.X release.
        • -
      -
      • -
    - -

    7.ii. Commit Messages and Repository Rules

    - -

    Information on repository rules, such as commit messages can be found at http://wiki.phpbb.com/display/DEV/Git.

    - -
    - -
    Back to Top
    - -
    -
    - -
    - -

    9. Copyright and disclaimer

    +

    8. Copyright and disclaimer