[DOCUMENTATION] English:

 - manual fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16589 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/en/module_specs/Zend_Log-Writers-Syslog.xml

@@ -5,10 +5,10 @@
 
     <para>
         <classname>Zend_Log_Writer_Syslog</classname> writes log entries to the
-        system log (syslog). Internally, it proxies to PHP's
-        <functionname>openlog()</functionname>,
-        <functionname>closelog()</functionname>, and
-        <functionname>syslog()</functionname> functions.
+        system log (syslog). Internally, it proxies to <acronym>PHP</acronym>'s
+        <methodname>openlog()</methodname>,
+        <methodname>closelog()</methodname>, and
+        <methodname>syslog()</methodname> functions.
     </para>
 
     <para>
@@ -21,12 +21,12 @@
 
     <para>
         By default, all syslog messages generated are prefixed with the string
-        "Zend_Log".  You may specify a different "application" name by which to
+        "Zend_Log". You may specify a different "application" name by which to
         identify such log messages by either passing the application name to the
         contructor or the application accessor:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // At instantiation, pass the "application" key in the options:
 $writer = new Zend_Log_Writer_Syslog(array('application' => 'FooBar'));
 
@@ -43,12 +43,12 @@ $writer->setApplication('BarBaz');
 
     <para>
         You may specify the log facility either in the constructor or via an
-        accessor. It should be one of the <functionname>openlog()</functionname>
+        accessor. It should be one of the <methodname>openlog()</methodname>
         constants defined on the <ulink url="http://php.net/openlog">openlog()
             manual page</ulink>.
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 // At instantiation, pass the "facility" key in the options:
 $writer = new Zend_Log_Writer_Syslog(array('facility' => LOG_AUTH));
 
@@ -59,7 +59,7 @@ $writer->setFacility(LOG_USER);
     <para>
         When logging, you may continue to use the default
         <classname>Zend_Log</classname> priority constants; internally, they are
-        mapped to the appropriate <functionname>syslog()</functionname> priority
+        mapped to the appropriate <methodname>syslog()</methodname> priority
         constants.
     </para>
 </sect2>

documentation/manual/en/module_specs/Zend_View-Helpers-BaseUrl.xml

@@ -4,42 +4,42 @@
     <title>BaseUrl Helper</title>
 
     <para>
-        While most URLs generated by the framework have the base URL 
-        prepended automatically, developers will need to prepend the
-        base URL to their own URLs in order for paths to resources to 
-        be correct.
+        While most <acronym>URL</acronym>s generated by the framework have the base
+        <acronym>URL</acronym> prepended automatically, developers will need to prepend the
+        base <acronym>URL</acronym> to their own <acronym>URL</acronym>s in order for paths
+        to resources to be correct.
     </para>
 
     <para>
         Usage of the BaseUrl helper is very straightforward:
     </para>
 
-    <programlisting role="php"><![CDATA[
+    <programlisting language="php"><![CDATA[
 /*
  * The following assume that the base URL of the page/application is "/mypage".
  */
 
 /*
- * Prints: 
+ * Prints:
  * <base href="/mypage/" />
  */
-<base href="<?php echo $this->baseUrl(); ?>" /> 
+<base href="<?php echo $this->baseUrl(); ?>" />
 
 /*
  * Prints:
  * <link rel="stylesheet" type="text/css" href="/mypage/css/base.css" />
  */
-<link rel="stylesheet" type="text/css" 
-     href="<?php echo $this->baseUrl('css/base.css'); ?>" /> 
+<link rel="stylesheet" type="text/css"
+     href="<?php echo $this->baseUrl('css/base.css'); ?>" />
 ]]></programlisting>
 
     <note>
         <para>
-            For simplicity's sake, we strip out the entry PHP file (e.g.,
-            "index.php") from the base URL that was contained in
-            <classname>Zend_Controller</classname>. However, in some situations
+            For simplicity's sake, we strip out the entry <acronym>PHP</acronym> file (e.g.,
+            "<filename>index.php</filename>") from the base <acronym>URL</acronym> that was
+            contained in <classname>Zend_Controller</classname>. However, in some situations
             this may cause a problem. If one occurs, use
-            <code>$this->getHelper('BaseUrl')->setBaseUrl()</code> to set your
+            <methodname>$this->getHelper('BaseUrl')->setBaseUrl()</methodname> to set your
             own BaseUrl.
         </para>
     </note>