diff --git a/build/README b/build/README index 19cf4ad1ec2..dc9c743175f 100644 --- a/build/README +++ b/build/README @@ -34,7 +34,7 @@ See makepack-howto.txt for prerequisites. -------------------------------------------------------------------------------------------------- -- To build developper documentation, launch the script +- To build developer documentation, launch the script > perl dolibarr-doxygen-build.pl diff --git a/build/debian/README.howto b/build/debian/README.howto index 45df1e9df70..f01add2f013 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -81,7 +81,7 @@ export QUILT_PATCHES=debian/patches # dpkg -l List all packages # dpkg -b To build binary only package # dpkg -c package.deb List content of package -# dpkg -I package.deb Give informations on package +# dpkg -I package.deb Give information on package # dpkg -i package.deb Install a package # dpkg-reconfigure -plow package Reconfigure package # dpkg -L packagename List content of installed package @@ -173,7 +173,7 @@ or > ls /srv/chroot Puis pour se connecter et préparer l'environnement -> schroot -c name_of_chroot (exemple schroot -c unstable-amd64-sbuild) +> schroot -c name_of_chroot (example schroot -c unstable-amd64-sbuild) > cat /etc/debian_chroot to check which debian branch we are into > apt-get install vim dialog > vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok) @@ -249,7 +249,7 @@ ou > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z] Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x] -Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file +Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc @@ -345,7 +345,7 @@ To update dolibarr debian package when only files not into debian has changed: * Checkout the branch you want to work on: master of debian/... * Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch" -* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch. +* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch. * Update the debian/changelog to add entry of change. Once files has been prepared, it's time to test: @@ -357,7 +357,7 @@ ou > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5] Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5] -Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file +Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommitted file Note: You can use git-buildpackage -us -uc -d if you want to test build when dependencies does not match Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc diff --git a/build/debian/copyright b/build/debian/copyright index b99b8a65b5d..5f1b73d9b64 100644 --- a/build/debian/copyright +++ b/build/debian/copyright @@ -64,7 +64,7 @@ License: GPL-3+ Files: htdocs/includes/ckeditor/* Copyright: 2003-2012 CKSource - Frederico Knabben License: GPL-2+ - The ckeditor is tripple licensed under the GNU General Public License (GPL), + The ckeditor is triple licensed under the GNU General Public License (GPL), GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL). In Debian, it is distributed under the GNU General Public License (GPL). . diff --git a/build/debian/rules b/build/debian/rules index df6abfd1b89..5f8b14e49ea 100755 --- a/build/debian/rules +++ b/build/debian/rules @@ -4,7 +4,7 @@ export DH_VERBOSE=1 export DH_OPTIONS=-v -#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file +#export DH_COMPAT=7 # This is the debhelper compatibility version to use, now defined into compat file %: diff --git a/build/docker/mariadb/Dockerfile b/build/docker/mariadb/Dockerfile index a4db0f42065..792f0623bd4 100644 --- a/build/docker/mariadb/Dockerfile +++ b/build/docker/mariadb/Dockerfile @@ -1,3 +1,3 @@ FROM mariadb:latest -# Enable comented out UTF8 charset/collation options +# Enable commented out UTF8 charset/collation options RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl index 5a4849a3a5b..32a852f22d8 100755 --- a/build/doxygen/dolibarr-doxygen-build.pl +++ b/build/doxygen/dolibarr-doxygen-build.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl #-------------------------------------------------------------------- -# Lance la generation de la doc dev doxygen +# Start the generation of the development documentation with doxygen #-------------------------------------------------------------------- -# Detecte repertoire du script +# Determine the patho of this script ($DIR=$0) =~ s/([^\/\\]+)$//; $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index debb1ce6301..d6fc7b1ef9e 100644 --- a/build/doxygen/dolibarr-doxygen.doxyfile +++ b/build/doxygen/dolibarr-doxygen.doxyfile @@ -283,10 +283,10 @@ TYPEDEF_HIDES_STRUCT = NO # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/build/doxygen/doxygen-awesome.css b/build/doxygen/doxygen-awesome.css index 0b1c8c20892..21150c99adc 100644 --- a/build/doxygen/doxygen-awesome.css +++ b/build/doxygen/doxygen-awesome.css @@ -160,7 +160,7 @@ html { --toc-background: var(--side-nav-background); --toc-foreground: var(--side-nav-foreground); - /* height of an item in any tree / collapsable table */ + /* height of an item in any tree / collapsible table */ --tree-item-height: 30px; --memname-font-size: var(--code-font-size); diff --git a/build/launchpad/README b/build/launchpad/README index fc284e70b20..b1ebcd25678 100644 --- a/build/launchpad/README +++ b/build/launchpad/README @@ -49,7 +49,7 @@ If you want to build/test package locally: Use URL pattern (stable): For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz -- For Dev, you can also add link serie to GIT HEAD. +- For Dev, you can also add link series to GIT HEAD. - For stable, you can init from command line cd bzr/dolibarr-stable bzr init diff --git a/build/makepack-dolibarrtheme.pl b/build/makepack-dolibarrtheme.pl index 954111a09cb..2171d87922e 100755 --- a/build/makepack-dolibarrtheme.pl +++ b/build/makepack-dolibarrtheme.pl @@ -258,7 +258,7 @@ foreach my $target (keys %CHOOSEDTARGET) { if ($CHOOSEDTARGET{$target} < 0) { print "Package $target not built (bad requirement).\n"; } else { - print "Package $target built succeessfully in $DESTI\n"; + print "Package $target built successfully in $DESTI\n"; } } diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index ca228f804d0..654bca95256 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -18,7 +18,7 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke See file build/exe/doliwamp.iss to know the doliwamp version currently setup. > Add path to ISCC into PATH windows var: Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH -> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), +> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended), open file build/exe/doliwamp.iss and click on button "Compile". The .exe file will be build into directory build. @@ -47,7 +47,7 @@ Prerequisites to build autoexe DoliWamp package from Windows: This files describe steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step. -- Check all files are commited. +- Check all files are committed. - Update version/info in ChangeLog, for this you can: To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" @@ -72,7 +72,7 @@ Recopy the content of the output file into the file ChangeLog. This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step. -- Check all files are commited. +- Check all files are committed. - Update version/info in ChangeLog, for this you can: To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0) <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa" diff --git a/build/obs/README b/build/obs/README index 44427c01d49..6b047b42fcf 100644 --- a/build/obs/README +++ b/build/obs/README @@ -54,5 +54,5 @@ OBS:QualityCategory Stable|Testing|Development|Private For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category https://build.opensuse.org/project/show/Application:ERP - Once done, go into project, category, subproject and enter a subproject for your application. -Fo example: Dolibarr +For example: Dolibarr - Then go onto project into your home and ask a publish to the category/you project your created. diff --git a/build/patch/README b/build/patch/README index ec769bd3d71..6b63713122f 100644 --- a/build/patch/README +++ b/build/patch/README @@ -4,6 +4,6 @@ Building a Patch file ################################################## This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree. -The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch. +The output patch file can then be submitted on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch. Using this tool is now deprecated. You must use git pull requests to submit contributions. diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 6b00d5243b9..58723960150 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -177,14 +177,14 @@ into * Removed useless directories ("examples", "tools") -* Optionnaly, removed all fonts except - dejavusans* (used by greek, arab, persan, romanian, turkish), +* Optionally, removed all fonts except + dejavusans* (used by greek, arab, person, romanian, turkish), freemono* (russian), cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), helvetica* (all other languages), zapfdingbats.php (for special chars like form checkboxes) -* Optionnaly, made freemono the default monotype font if we removed courier +* Optionally, made freemono the default monotype font if we removed courier In htdocs/includes/tecnickcom/tcpdf/tcpdf.php - protected $default_monospaced_font = 'courier'; + protected $default_monospaced_font = 'freemono'; diff --git a/dev/examples/ical/event_recu.txt b/dev/examples/ical/event_recu.txt index 5bcc491a0b3..2a6b0322595 100644 --- a/dev/examples/ical/event_recu.txt +++ b/dev/examples/ical/event_recu.txt @@ -1,4 +1,4 @@ -Example fo recurring event, 1 week, no end, exported by Google +Example for recurring event, 1 week, no end, exported by Google # The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then # first occurrence was moved on tuesday. So this record were added. @@ -38,7 +38,7 @@ END:VEVENT -Example fo recurring event, every 2 month, no end, exported by Google +Example for recurring event, every 2 month, no end, exported by Google BEGIN:VEVENT DTSTART;TZID=Europe/Paris:20150519T080000 diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php index 554e8ad49d6..68aab032686 100755 --- a/dev/initdata/generate-order.php +++ b/dev/initdata/generate-order.php @@ -48,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"; /* - * Parametre + * Parameter */ define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10); diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php index 287eaeb173f..4bdcad752ef 100755 --- a/dev/initdata/generate-thirdparty.php +++ b/dev/initdata/generate-thirdparty.php @@ -50,7 +50,7 @@ $listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Doroth /* - * Parametre + * Parameter */ define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10); diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php index a0e40d7b883..4157cee8686 100755 --- a/dev/initdata/import-thirdparties.php +++ b/dev/initdata/import-thirdparties.php @@ -153,7 +153,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape)) } $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1); if (empty($object->cond_reglement_id)) { - print " - Error cant find payment mode for ".$condpayment."\n"; + print " - Error can't find payment mode for ".$condpayment."\n"; $errorrecord++; } } diff --git a/dev/setup/apache/virtualhost b/dev/setup/apache/virtualhost index 7eff1859d4f..798031fb404 100644 --- a/dev/setup/apache/virtualhost +++ b/dev/setup/apache/virtualhost @@ -71,7 +71,7 @@ - # Log directoves + # Log directives ErrorLog /var/log/apache2/myvirtualalias_error_log TransferLog /var/log/apache2/myvirtualalias_access_log @@ -82,7 +82,7 @@ AddEncoding gzip .jgz - # Add cach performance directives + # Add cache performance directives ExpiresActive On ExpiresByType image/x-icon A2592000 ExpiresByType image/gif A2592000 diff --git a/dev/setup/codesniffer/php.ini b/dev/setup/codesniffer/php.ini index 00f3b2d4efa..6a5fa9b6292 100644 --- a/dev/setup/codesniffer/php.ini +++ b/dev/setup/codesniffer/php.ini @@ -1533,7 +1533,7 @@ session.cache_expire = 180 ; - User may send URL contains active session ID ; to other person via. email/irc/etc. ; - URL that contains active session ID may be stored -; in publically accessible computer. +; in publicly accessible computer. ; - User may access your site with the same session ID ; always using URL stored in browser's history or bookmarks. ; http://php.net/session.use-trans-sid diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index e286450f73b..a87d87fe2db 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -110,7 +110,7 @@ --> - +