From 58cb46d344685c7bba4579e5b693ec448877d7cd Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 8 Jul 2010 09:15:03 +0200 Subject: [ticket/9704] Fix minor typo in coding guidelines. PHPBB3-9704 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 7f747e09e2..1978a0a307 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -288,7 +288,7 @@ PHPBB_QA (Set board to QA-Mode, which means the updater also c
-

Please note that these Guidelines applies to all php, html, javascript and css files.

+

Please note that these guidelines apply to all php, html, javascript and css files.

2.i. Variable/Function Naming

-- cgit v1.2.1 From b6a60d4d64abc78d5e3e3899e912e31499dc73f9 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 25 Jun 2010 01:43:58 +0200 Subject: [ticket/9509] The VCS is now git Partially cherry-picked from 163a0974. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 123 +++++--------------------------------- 1 file changed, 15 insertions(+), 108 deletions(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 1978a0a307..83bd229c8c 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -90,7 +90,7 @@
  • VCS Guidelines
    1. Repository structure
      2. -
    2. Commit messages
      3. +
    3. Commit Messages and Repository Rules
  • Guidelines Changelog
    • @@ -2326,126 +2326,33 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
    -

    The version control system for phpBB3 is subversion. The repository is available at http://code.phpbb.com/svn/phpbb.

    +

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

    7.i. Repository Structure

      -
    • trunk
      The latest unstable development version with new features etc. Contains the actual board in /trunk/phpBB
      • -
    • branches
      Development branches of stable phpBB releases. Copied from /trunk at the time of release. +
    • 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.0/branches/phpBB-3_0_0/phpBB
        Development branch of the stable 3.0 line. Bug fixes are applied here.
        • -
      • phpBB2/branches/phpBB-2_0_0/phpBB
        Old phpBB2 development branch.
        • +
      • 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.
      • -
    • tags
      Released versions. Copies of trunk or the respective branch, made at the time of release. +
    • master
      A branch containing all stable phpBB3 release points
      • +
    • tags
      Released versions. Stable ones get merged into the master branch.
        -
      • /tags/release_3_0_BX
        Beta release X of the 3.0 line.
        • -
      • /tags/release_3_0_RCX
        Release candidate X of the 3.0 line.
        • -
      • /tags/release_3_0_X-RCY
        Release candidate Y of the stable 3.0.X release.
        • -
      • /tags/release_3_0_X
        Stable 3.0.X release.
        • -
      • /tags/release_2_0_X
        Old stable 2.0.X release.
        • +
      • 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

    - -

    The commit message should contain a brief explanation of all changes made within the commit. Often identical to the changelog entry. A bug ticket can be referenced by specifying the ticket ID with a hash, e.g. #12345. A reference to another revision should simply be prefixed with r, e.g. r12345.

    - -

    Junior Developers need to have their patches approved by a development team member first. The commit message must end in a line with the following format:

    - - 
    -Authorised by: developer1[, developer2[, ...]]
-
    - -
    - -
    Back to Top
    - -
    - - -
    - -

    8. Guidelines Changelog

    -
    -
    - -
    -

    Revision 10007

    - - - -

    Revision 9817

    - -
      -
    • Added VCS section.
      • -
    - -

    Revision 8732

    - - - -

    Revision 8596+

    - -
      -
    • Removed sql_build_array('MULTI_INSERT'... statements.
      • -
    • Added sql_multi_insert() explanation.
      • -
    - -

    Revision 1.31

    - -
      -
    • Added add_form_key and check_form_key.
      • -
    - -

    Revision 1.24

    - - - -

    Revision 1.16

    - - - -

    Revision 1.11-1.15

    - -
      -
    • Various document formatting, spelling, punctuation, grammar bugs.
      • -
    - -

    Revision 1.9-1.10

    - - - -

    Revision 1.8

    - - - -

    Revision 1.5

    - - +

    7.ii. Commit Messages and Reposiory Rules

    +

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

    .
    -- cgit v1.2.1 From b27b69cf375df2374a280dba5d14a257dae25365 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 19 Oct 2010 12:22:07 +0200 Subject: [ticket/9857] Remove visible $Id$ from phpBB/docs files. PHPBB3-9857 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 1978a0a307..c9b34886df 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2475,7 +2475,7 @@ Authorised by: developer1[, developer2[, ...]]
    -
    $Id$
    +
     
    -- cgit v1.2.1 From 5ad5930c8f664035c92453230489b1dbbc5acbab Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 19 Oct 2010 13:45:50 +0200 Subject: [ticket/9509] Close anchor tag in coding guidelines Thanks Andreas. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 83bd229c8c..ae6cbaacbc 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2352,7 +2352,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))

    7.ii. Commit Messages and Reposiory Rules

    -

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

    . +

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

    . -- cgit v1.2.1 From c4dfe24feca3c47fab40548554a125ad55da6b70 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 19 Oct 2010 13:51:47 +0200 Subject: [ticket/9509] Remove section 8 from index Thanks Andreas. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index ae6cbaacbc..e9b222858d 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -93,7 +93,6 @@
  • Commit Messages and Repository Rules
    • -
  • Guidelines Changelog
  • Copyright and disclaimer
    • -- cgit v1.2.1 From 859149f5c36c1ebd437f43de940528d25931d6fd Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 11 Nov 2010 23:41:01 +0100 Subject: [ticket/9509] Fix a typo and wrong period placement Thanks to Michael C. for spotting this. PHPBB3-9509 --- phpBB/docs/coding-guidelines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/docs/coding-guidelines.html') diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 76afc79f99..5a73554741 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -2349,9 +2349,9 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2)) -

    7.ii. Commit Messages and Reposiory Rules

    +

    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

    . +

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

    -- cgit v1.2.1