Skip to content

Commit

Permalink
Merge pull request codeigniter4#3998 from sba/typos3
Browse files Browse the repository at this point in the history
fixing typos in userguide
  • Loading branch information
paulbalandan authored Dec 18, 2020
2 parents b7b3113 + b2005d1 commit c093983
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions user_guide_src/source/helpers/text_helper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -387,19 +387,19 @@ The following functions are available:
.. php:function:: excerpt($text, $phrase = false, $radius = 100, $ellipsis = '...')
:param string $text: Text to extract an excerpt
:param string $phrase: Phrase or word to extract the text arround
:param string $phrase: Phrase or word to extract the text around
:param int $radius: Number of characters before and after $phrase
:param string $ellipsis: What to use as the ellipsis character
:returns: Excerpt.
:rtype: string

This function will extract $radius number of characters before and after the
central $phrase with an elipsis before and after.
central $phrase with an ellipsis before and after.

The first paramenter is the text to extract an excerpt from, the second is the
The first parameter is the text to extract an excerpt from, the second is the
central word or phrase to count before and after. The third parameter is the
number of characters to count before and after the central phrase. If no phrase
passed, the excerpt will include the first $radius characters with the elipsis
passed, the excerpt will include the first $radius characters with the ellipsis
at the end.

Example::
Expand Down
3 changes: 1 addition & 2 deletions user_guide_src/source/installation/running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ eg. ``apache2/conf/extra/httpd-vhost.conf``::
</VirtualHost>

If your project folder is not a subfolder of the Apache document root, then your
<VirtualHost> element may need a nested <Directory> element to grant the web s
erver access to the files.
<VirtualHost> element may need a nested <Directory> element to grant the web server access to the files.

Testing
-------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/caching.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Available names are: dummy, file, memcached, redis, predis, wincache.

**$backupHandler**

In the case that the first choice $hanlder is not available, this is the next cache handler to load.
In the case that the first choice $handler is not available, this is the next cache handler to load.
This is commonly the **file** handler since the file system is always available, but may not fit
more complex, multi-server setups.

Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/images.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ previous results::
->save('/path/to/image/mypic_thumb.jpg');

This example would take the same image and first fix any mobile phone orientation issues,
rotate the image by 90 degress, and then crop the result into a 100x100 pixel image,
rotate the image by 90 degrees, and then crop the result into a 100x100 pixel image,
starting at the top left corner. The result would be saved as the thumbnail.

.. note:: In order for the image class to be allowed to do any
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ meta tag for you::
// Generates: <meta name="{csrf_header}" content="{csrf_hash}" />
<?= csrf_meta() ?>

The order of checking the avability of the CSRF token is as follows:
The order of checking the availability of the CSRF token is as follows:

1. ``$_POST`` array
2. Http header
Expand Down

0 comments on commit c093983

Please sign in to comment.