From c9c4d306ef3692dee79d7e27c16a1f5ff4ef42e4 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 22 Jan 2009 21:17:52 +0000
Subject: [PATCH] =?UTF-8?q?PHPdoc=20updates.=20See=20=E2=82=AC8805=20props?=
 =?UTF-8?q?=20jacobsantos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.automattic.com/wordpress/trunk@10411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 12 +++++++++++-
 wp-includes/plugin.php           |  4 ----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index b192a8b3b6..d1bbfc54ec 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -98,7 +98,17 @@ function get_sidebar( $name = null ) {
  *
  * Will first attempt to locate the searchform.php file in either the child or
  * the parent, then load it. If it doesn't exist, then the default search form
- * will be displayed.
+ * will be displayed. The default search form is HTML, which will be displayed.
+ * There is a filter applied to the search form HTML in order to edit or replace
+ * it. The filter is 'get_search_form'.
+ *
+ * This function is primarily used by themes which want to hardcode the search
+ * form into the sidebar and also by the search widget in WordPress.
+ *
+ * There is also an action that is called whenever the function is run called,
+ * 'get_search_form'. This can be useful for outputting JavaScript that the
+ * search relies on or various formatting that applies to the beginning of the
+ * search. To give a few examples of what it can be used for.
  *
  * @since 2.7.0
  */
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index b00ed08a1c..ead0a229a8 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -512,8 +512,6 @@ function plugin_basename($file) {
  * @subpackage Plugin
  * @since 2.0
  *
- * @access private
- *
  * @param string $file The filename of the plugin including the path.
  * @param callback $function the function hooked to the 'activate_PLUGIN' action.
  */
@@ -539,8 +537,6 @@ function register_activation_hook($file, $function) {
  * @subpackage Plugin
  * @since 2.0
  *
- * @access private
- *
  * @param string $file The filename of the plugin including the path.
  * @param callback $function the function hooked to the 'activate_PLUGIN' action.
  */