[web-doc] master: Make reality act like the documentation
[email protected] (Derick Rethans) Mon, 6 Nov 2023 09:52:11 +0000
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <[email protected]> |
Author: Derick Rethans (derickr)
Date: 2023-11-06T09:38:23Z
Commit: https://github.com/php/web-doc/commit/e30a3d2392667af8856015890f4e2772270d5670
Raw diff: https://github.com/php/web-doc/commit/e30a3d2392667af8856015890f4e2772270d5670.diff
Make reality act like the documentation
Changed paths:
M README.md
M build-ops.sample
M scripts/populatedocs.sh
Diff:
diff --git a/README.md b/README.md
index 4bee20a..759ef87 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ Requirements:
- `@SQLITEDIR@` - absolute path to `/sqlite/` directory
- `@SRCDIR@` - path to the directory with PHP source code in GIT repo
4. You need to run the scripts/populatedocs.sh to fetch all the required documentation for the site.
-6. You need to run the scripts/generation.sh to generate the database and graphs (Time of generation: 2.5009639263153 s)
-7. Configure the virtual host under Apache. Current suggested settings are:
+5. You need to run the scripts/generation.sh to generate the database and graphs (Time of generation: 2.5009639263153 s)
+6. Configure the virtual host under Apache. Current suggested settings are:
```
<VirtualHost 127.0.0.1:80>
ServerName doc.php.net
diff --git a/build-ops.sample b/build-ops.sample
index 2c9776e..e54196c 100644
--- a/build-ops.sample
+++ b/build-ops.sample
@@ -2,7 +2,7 @@
# Please read README.md in the same directory to get more info about filling in this file
PHP=@PHP@
-GIT_DIR=@GITDIR@
+GITDIR=@GITDIR@
DOCWEB=@DOCWEB@
PHDDIR=@PHDDIR@
SCRIPTSDIR=@SCRIPTSDIR@
diff --git a/scripts/populatedocs.sh b/scripts/populatedocs.sh
index 3cdadd7..88cd5df 100755
--- a/scripts/populatedocs.sh
+++ b/scripts/populatedocs.sh
@@ -24,14 +24,14 @@ pushd .
cd `dirname $0`/..
source ./build-ops
-if [ ! -d ${GIT_DIR} ]
+if [ ! -d ${GITDIR} ]
then
- echo "Making GIT directory: ${GIT_DIR}"
- /bin/mkdir ${GIT_DIR}
+ echo "Making GIT directory: ${GITDIR}"
+ /bin/mkdir ${GITDIR}
fi
-echo "Changing to GIT directory: ${GIT_DIR}"
-cd ${GIT_DIR}
+echo "Changing to GIT directory: ${GITDIR}"
+cd ${GITDIR}
echo "Checking out PHP docs..."
if [ -d en ]
@@ -48,4 +48,4 @@ else
fi
echo -n "Reverting directory:"
-popd
\ No newline at end of file
+popd