diff --git a/features/commandline.xml b/features/commandline.xml index 4b317b3776..244467c89f 100644 --- a/features/commandline.xml +++ b/features/commandline.xml @@ -1,5 +1,5 @@ - + Using PHP from the command line @@ -101,7 +101,7 @@ - This directives cannot be initialzied with another value from the + These directives cannot be initialzied with another value from the configuration file &php.ini; or a custom one (if specified). This is a limitation because those default values are applied after all configuration files have been parsed. However, their value can be changed @@ -112,7 +112,7 @@ - The ease the operating in the shell environment, the following constants + To ease working in the shell environment, the following constants are defined: CLI specific Constants @@ -165,7 +165,7 @@ $stderr = fopen('php://stderr', 'w'); php -r 'fwrite(STDERR, "stderr\n");' - You do not need to explicitely close these streams, this is automatically + You do not need to explicitly close these streams, this is automatically done by PHP. @@ -226,7 +226,7 @@ $ php -f another_directory/test.php The list of command line options provided by the PHP - binary can be queryied anytime by running PHP with the + binary can be queried anytime by running PHP with the -h switch: final_output.txt You cannot combine any of the three ways to execute code. - Like every shell application not only the PHP binary + Like every shell application, the PHP binary accepts a number of arguments but also your PHP script can receive them. The number of arguments which can be passed to your script is not limited by PHP (the shell has a certain size limit @@ -361,7 +361,7 @@ array(2) { However, there's another way of using PHP for shell - scripting. You can write a script which's first line starts with + scripting. You can write a script where the first line starts with #!/usr/bin/php and then following the normal PHP code included within the PHP starting and end tags and set the execution attributes of the file diff --git a/features/file-upload.xml b/features/file-upload.xml index 6b8dfde35f..213c017adc 100644 --- a/features/file-upload.xml +++ b/features/file-upload.xml @@ -1,5 +1,5 @@ - + Handling file uploads @@ -43,7 +43,7 @@ Send this file: The MAX_FILE_SIZE is advisory to the browser. It is easy to circumvent this maximum. So don't count on it that the browser - obeys you wish! The PHP-settings for maximum-size, however, + obeys your wish! The PHP-settings for maximum-size, however, cannot be fooled. diff --git a/reference/dbplus/reference.xml b/reference/dbplus/reference.xml index 47f20d2fa3..c159b3a55a 100644 --- a/reference/dbplus/reference.xml +++ b/reference/dbplus/reference.xml @@ -1,5 +1,5 @@ - + DB++ Functions DB++ @@ -10,11 +10,11 @@
&reftitle.intro; - db++, made by the german company Concept asa, is a relational database system with high performance and low memory and disk usage in mind. While providing SQL as an additional language - interface it is not really a SQL database in the first place but + interface, it is not really a SQL database in the first place but provides its own AQL query language which is much more influenced by the relational algebra then SQL is. diff --git a/reference/mysql/functions/mysql-drop-db.xml b/reference/mysql/functions/mysql-drop-db.xml index 513ba475ed..4ee2c488b1 100644 --- a/reference/mysql/functions/mysql-drop-db.xml +++ b/reference/mysql/functions/mysql-drop-db.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ The function mysql_drop_db is deprecated. It is - prefarable to use mysql_query to issue a SQL + preferable to use mysql_query to issue a SQL DROP DATABASE statement instead. diff --git a/reference/mysql/functions/mysql-insert-id.xml b/reference/mysql/functions/mysql-insert-id.xml index cfc84f6668..22df3993ac 100644 --- a/reference/mysql/functions/mysql-insert-id.xml +++ b/reference/mysql/functions/mysql-insert-id.xml @@ -1,11 +1,11 @@ - + mysql_insert_id - Get the id generated from the previous INSERT operation + Get the ID generated from the previous INSERT operation diff --git a/reference/mysql/functions/mysql-list-fields.xml b/reference/mysql/functions/mysql-list-fields.xml index a44ca7a9fa..90ef6af079 100644 --- a/reference/mysql/functions/mysql-list-fields.xml +++ b/reference/mysql/functions/mysql-list-fields.xml @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ mysql_list_fields retrieves information - about the given tablename. Arguments are the database name and + about the given table name. Arguments are the database name and the table name. A result pointer is returned which can be used with mysql_field_flags, mysql_field_len, diff --git a/reference/mysql/functions/mysql-stat.xml b/reference/mysql/functions/mysql-stat.xml index 7e6025e9f8..4cc460ec1a 100644 --- a/reference/mysql/functions/mysql-stat.xml +++ b/reference/mysql/functions/mysql-stat.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ mysql_stat currently only returns status for uptime, threads, queries, open tables, flush tables and queries per second. For a complete list of other status variables you have to use the SHOW STATUS - sql command. + SQL command. diff --git a/reference/mysql/functions/mysql-thread-id.xml b/reference/mysql/functions/mysql-thread-id.xml index e81ef94b0b..56f163b314 100644 --- a/reference/mysql/functions/mysql-thread-id.xml +++ b/reference/mysql/functions/mysql-thread-id.xml @@ -1,10 +1,10 @@ - + mysql_thread_id - Return the current thread id + Return the current thread ID Description @@ -13,7 +13,11 @@ resourcelink_identifier - mysql_thread_id returns the current thread id. If the connection is lost and you reconnect with mysql_ping, the thread ID will change. This means you should not get the thread ID and store it for later. You should get it when you need it. + mysql_thread_id returns the current thread ID. If + the connection is lost and you reconnect with + mysql_ping, the thread ID will change. This means + you should not get the thread ID and store it for later. You should get + it when you need it. <function>mysql_thread_id</function> example diff --git a/reference/mysql/reference.xml b/reference/mysql/reference.xml index cac02a1fa7..c1af3b2148 100644 --- a/reference/mysql/reference.xml +++ b/reference/mysql/reference.xml @@ -1,5 +1,5 @@ - + MySQL Functions MySQL @@ -121,7 +121,7 @@ - Wether to allow + Whether to allow persistent connections to MySQL. @@ -237,7 +237,7 @@ There are two resource types used in the MySQL module. The first one is the link identifier for a database connection, the second a resource - which helds the result of a query. + which holds the result of a query.