From a9af9814107a4d3f1049503052332427ab33ec79 Mon Sep 17 00:00:00 2001 From: Colin Viebrock Date: Tue, 6 Feb 2001 22:19:02 +0000 Subject: [PATCH] Add require_once 'prepend.inc' back in again. That's more than a dozen files ... :( --- .htaccess | 1 - ChangeLog-4.php | 1 + FAQ.php | 1 + README.mirror | 1 - anoncvs.php | 1 + books.php | 1 + bug-pwd-finder.php | 2 + bugs-dos-and-donts.php | 1 + bugs-generating-backtrace.php | 1 + bugs-php3.php | 1 + bugs.php | 1 + bugstats.php | 2 + cfp.php | 3 +- credits.php | 1 + cvs-php.php | 86 ++++++++++++++++++++--------- cvsup.php | 23 +++++--- docs.php | 1 + download-logos.php | 1 + download-php3.php | 1 + downloads.php | 3 +- get-user-notes.php | 1 + include/{shared.inc => prepend.inc} | 0 index.php | 2 + license.html | 10 +++- links.php | 1 + manual-lookup.php | 1 + manual/about-notes.php | 1 + manual/add-note.php | 1 + manual/html/index.php | 1 + manual/index.php | 1 + manual/phpfi2.php | 1 + manual/set-magic-cookie.php | 2 + mirrors.php | 1 + news.php | 1 + oldnews.php | 1 + projects.php | 1 + quickref.php | 1 + search.php | 2 + sites.php | 3 +- source.php | 1 + support.php | 1 + thanks.php | 1 + tips.php | 1 + tut.php | 2 +- usage.php | 1 + 45 files changed, 130 insertions(+), 42 deletions(-) rename include/{shared.inc => prepend.inc} (100%) diff --git a/.htaccess b/.htaccess index 04d86e0f4..2ba68d384 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,5 @@ php_value include_path .:./include:../include:../../include -php_value auto_prepend_file shared.inc php_flag short_open_tag on DirectoryIndex index.php diff --git a/ChangeLog-4.php b/ChangeLog-4.php index ed7f6f79d..b0313db05 100644 --- a/ChangeLog-4.php +++ b/ChangeLog-4.php @@ -1,4 +1,5 @@ diff --git a/FAQ.php b/FAQ.php index 1417c14f5..ee14821db 100644 --- a/FAQ.php +++ b/FAQ.php @@ -1,4 +1,5 @@ diff --git a/README.mirror b/README.mirror index 3973559aa..6a41232b2 100644 --- a/README.mirror +++ b/README.mirror @@ -23,7 +23,6 @@ Once you create a virtualhost which looks something like: ServerAdmin yourname@yourdomain.com DocumentRoot /www/htdocs/phpweb php_value include_path .:/www/htdocs/phpweb/include - php_value auto_prepend_file shared.inc php_flag short_open_tag on ErrorLog logs/error_log TransferLog logs/access_log diff --git a/anoncvs.php b/anoncvs.php index f1fe54ea7..e6acc7645 100644 --- a/anoncvs.php +++ b/anoncvs.php @@ -1,4 +1,5 @@ diff --git a/books.php b/books.php index 4e5fb9aa0..d8ca1c35c 100644 --- a/books.php +++ b/books.php @@ -1,4 +1,5 @@ diff --git a/bug-pwd-finder.php b/bug-pwd-finder.php index f34ebeabc..466f85ca7 100644 --- a/bug-pwd-finder.php +++ b/bug-pwd-finder.php @@ -1,4 +1,6 @@ diff --git a/bugs-generating-backtrace.php b/bugs-generating-backtrace.php index 505c358fe..58b23db33 100644 --- a/bugs-generating-backtrace.php +++ b/bugs-generating-backtrace.php @@ -1,4 +1,5 @@ diff --git a/bugs-php3.php b/bugs-php3.php index b9901cc97..a3c5bb9d1 100644 --- a/bugs-php3.php +++ b/bugs-php3.php @@ -1,4 +1,5 @@

Call for Participation

diff --git a/credits.php b/credits.php index 84a47c2af..f10472d60 100644 --- a/credits.php +++ b/credits.php @@ -1,4 +1,5 @@ -

Using CVS for PHP Development

+ +

+Using CVS for PHP Development +

+

All PHP development is done through a distributed revision control system called CVS. This helps us track changes and it makes it possible for people located in all corners of the world to collaborate on a project without having to worry about stepping on each others' toes. -

+

+

Please note that you do not need a CVS account to access the CVS tree. See cvs.php.net for details. You only need your own CVS account if you will be regularly committing things to the CVS tree. -

+

+

And once again since people just don't seem to understand this point: -

+

+

@@ -26,9 +34,10 @@ And once again since people just don't seem to understand this point: -
Does Not Require CVS Account  Requires CVS Account
Learning PHP  Coding PHP source in C
One-time patch contributions   
Adding notes to documentation  Authoring PHP documentation
Writing web pages with PHP  Authoring www.php.net web pages
-

+

+ +

If you are contributing a patch, a small fix, or another minor change you are not required to obtain a CVS account before submitting it. If you are subscribed to php-dev@lists.php.net, @@ -37,20 +46,23 @@ patches to the PHP-dev list before requesting full CVS access is suggested, so the PHP development team can develop a working relationship with you and your code. It is suggested that all PHP developers subscribe to this list. -

+

+

Ok, if you are still reading, I assume you may actually need a CVS account. If you are not previously known to the PHP Development Team, then this is not an automatic process. Your best bet is to send mail to group@php.net and explain what you have in mind and perhaps give a bit of background on yourself. If you were told by a PHP developer to come here and fill out this form, you can skip sending the email to group@php.net. -

+

+

If, you have already established yourself in the above manner you can submit a CVS account request here: (only the encrypted version of the password is sent) In the purpose field, put a couple of words describing what you want to work on. This is mostly to jog our memories and allow us to match the account request with whatever previous correspondence that may taken place. -

+

+

Please note:
You do NOT need a CVS account to study PHP. You do NOT need @@ -58,7 +70,8 @@ a CVS account to learn PHP, to use PHP or to in any way do anything at all with PHP. If you are sitting there wondering if you need a CVS account, then you don't! -

+

+

@@ -70,18 +83,30 @@ you don't!
Full Name:
 
- + +

Thank you. Your request has been sent. - +

+ +

PLEASE, read our comments about applying for CVS accounts.

- +

+ +

INCOMPLETE FORM. GO BACK AND RESUBMIT.

- +

+

The CVS account, once granted and activated, gives you access to a number of things. First, and most important it gives you access to modify the PHP CVS tree. It also allows you to comment on and close bugs in the PHP bugs interface @@ -92,18 +117,23 @@ three things are:

  • PHP Bugs Database
  • Manual Errata Administration - +

    +

    If you are not familiar with CVS, you should have a look at the various documentation resources available at CVShome.org. This is also where to get the most recent version -of the CVS client.

    - +of the CVS client. +

    +

    All CVS commit messages get sent to the php-cvs mailing list. You should subscribe yourself to this mailing list. Instructions for subscribing are on the Support page. -

    +

    +

    CVS itself is quite easy to use. Follow the steps listed on the anonymous CVS page for checking out your tree. Substitute your own user name and password for the cvsread/phpfi combination listed there. You will not be able to do this until you receive confirmation of your account having been created. -

    +

    + +

    Next, once you have your CVS tree you need to know the following commands. They should all be executed from within the checked out tree. eg. cd php4

    @@ -117,11 +147,17 @@ mailing list. describe the changes you made. Please provide a good description here as it may help people in the future when looking at your code changes.
    -

    +

    + +

    It would probably be a good idea to put the following in your ~/.cvsrc file: 

    diff -u
 cvs -z4
 update -d -P
 checkout -P
    -

    Your CVS account also translates into a foo@php.net email address where foo is your CVS user id. +

    +

    +Your CVS account also translates into a foo@php.net email address where foo is your CVS user id. +

    + diff --git a/cvsup.php b/cvsup.php index 2a4a26f44..46dac467c 100644 --- a/cvsup.php +++ b/cvsup.php @@ -1,19 +1,25 @@ -

    Using CVSup to maintain local CVS repository

    +

    +Using CVSup To Maintain A Local CVS Repository +

    +

    In addition to anonymous CVS, we also provide read-only access to our CVS repository by using CVSup. While CVSup is faster at updating large trees, it is not as widely available as the standard cvs client. -We will describe now how you can use CVSup.

    +We will describe now how you can use CVSup. +

    +

    1. Download the appropiate binary distribution from the CVSup homepage.
    2. Follow the instructions in the Install file of the binary distribution -
    3. Create a php.cvsup file containing the following content:

      +

    4. Create a php.cvsup file containing the following content: 
       *default host=CVSup.php.net
 *default base=/usr/src/php
@@ -23,15 +29,16 @@ We will describe now how you can use CVSup.
      
 *default delete use-rel-suffix
 php3
 php4
-

      + This will cause the php3 and php4 trees to be stored in /usr/src/php (you need to create that directory manually). -

    5. At a command prompt, simply type:

      -cvsup php.cvsup -

    6. If you are behind a firewall, you might need to use:

      -cvsup -P - php.cvsup +

    7. At a command prompt, simply type: +
      cvsup php.cvsup
      +
    8. If you are behind a firewall, you might need to use: +
      cvsup -P - php.cvsup
    9. To build PHP, you need to install a few utilities (GNU autoconf, libtool, bison). Cd into php3 or php4 and run ./buildconf.
    +

    diff --git a/docs.php b/docs.php index e4db65490..15de36b55 100644 --- a/docs.php +++ b/docs.php @@ -1,4 +1,5 @@ diff --git a/download-logos.php b/download-logos.php index e8e996ba8..931fca53f 100644 --- a/download-logos.php +++ b/download-logos.php @@ -1,4 +1,5 @@ diff --git a/download-php3.php b/download-php3.php index e5559419b..a93068a84 100644 --- a/download-php3.php +++ b/download-php3.php @@ -1,4 +1,5 @@ diff --git a/get-user-notes.php b/get-user-notes.php index a5d6bbdde..c395463a0 100644 --- a/get-user-notes.php +++ b/get-user-notes.php @@ -1,4 +1,5 @@ \n"; diff --git a/license.html b/license.html index b9e5b02b8..067949e57 100644 --- a/license.html +++ b/license.html @@ -1,5 +1,7 @@ -PHP 3 License - + 
       -------------------------------------------------------------------- 
    Copyright (c) 2000 The PHP Development Team.  All rights reserved.
@@ -57,4 +59,6 @@
   For more information on the PHP Development Team and the PHP 
   project, please see www.php.net.
    - + diff --git a/links.php b/links.php index 2477819ca..91eacbf15 100644 --- a/links.php +++ b/links.php @@ -1,4 +1,5 @@ diff --git a/manual-lookup.php b/manual-lookup.php index 7bb796421..f2299d1da 100644 --- a/manual-lookup.php +++ b/manual-lookup.php @@ -1,5 +1,6 @@ diff --git a/manual/add-note.php b/manual/add-note.php index b75975bfd..e6c7ad78a 100644 --- a/manual/add-note.php +++ b/manual/add-note.php @@ -1,4 +1,5 @@ diff --git a/manual/set-magic-cookie.php b/manual/set-magic-cookie.php index db5cde746..b225ddbbf 100644 --- a/manual/set-magic-cookie.php +++ b/manual/set-magic-cookie.php @@ -1,4 +1,6 @@ diff --git a/thanks.php b/thanks.php index 074dfadb8..b245a4416 100644 --- a/thanks.php +++ b/thanks.php @@ -1,4 +1,5 @@ Jan 2001: PHP: 5104536 Domains, 832457 IP Addresses