httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1329859 - /httpd/httpd/trunk/docs/manual/developer/modguide.xml
Date Tue, 24 Apr 2012 17:05:01 GMT
Author: humbedooh
Date: Tue Apr 24 17:05:01 2012
New Revision: 1329859

URL: http://svn.apache.org/viewvc?rev=1329859&view=rev
Log:
Changing to <highlight> tags for syntax highlighting

Modified:
    httpd/httpd/trunk/docs/manual/developer/modguide.xml

Modified: httpd/httpd/trunk/docs/manual/developer/modguide.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/modguide.xml?rev=1329859&r1=1329858&r2=1329859&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/modguide.xml (original)
+++ httpd/httpd/trunk/docs/manual/developer/modguide.xml Tue Apr 24 17:05:01 2012
@@ -1077,7 +1077,7 @@ different meanings to the user of the se
 within which modules must operate. For example, let's assume you have this 
 configuration set up for mod_rewrite:
 </p>
-<example><pre>
+<highlight language="config">
 &lt;Directory &quot;/var/www&quot;&gt;
     RewriteCond %{HTTP_HOST} ^example.com$
     RewriteRule (.*) http://www.example.com/$1
@@ -1085,7 +1085,7 @@ configuration set up for mod_rewrite:
 &lt;Directory &quot;/var/www/sub&quot;&gt;
     RewriteRule ^foobar$ index.php?foobar=true
 &lt;/Directory&gt;
-</pre></example>
+</highlight>
 <p>
 In this example, you will have set up two different contexts for 
 mod_rewrite:</p>
@@ -1622,7 +1622,12 @@ static int example_handler(request_req *
         ap_rprintf(r, &quot;&lt;b&gt;%s&lt;/b&gt;: %s&lt;br/&gt;&quot;,
e[i].key, e[i].val);
     }
     return OK;
+<<<<<<< .mine
+}
+</highlight>
+=======
 }</highlight>
+>>>>>>> .r1329854
 <!-- END EXAMPLE CODE -->
 
 
@@ -1680,7 +1685,11 @@ static int example_handler(request_req* 
     }
     return OK;
 }
+<<<<<<< .mine
+</highlight>
+=======
     </highlight>
+>>>>>>> .r1329854
 <!-- END EXAMPLE CODE -->
 
 



Mime
View raw message