diff --git a/docs/contributor/code/README.md b/docs/contributor/code/README.md
index d282bc0bf..3a3d5a98b 100644
|
a
|
b
|
If you chose to contribute using GitHub “Pull Requests”, the git commands wi |
| 234 | 234 | # Git using Pull Requests |
| 235 | 235 | |
| 236 | 236 | # First make sure your origin master branch is up to date with BuddyPress remote one. |
| 237 | | git fetch usptream/master |
| | 237 | git fetch upstream/master |
| 238 | 238 | |
| 239 | 239 | # If you need to include some changes which happened upstream, merge them! |
| 240 | 240 | git merge origin/master |
| … |
… |
svn up |
| 415 | 415 | git pull origin master |
| 416 | 416 | |
| 417 | 417 | # Git using Pull Requests |
| 418 | | git fetch usptream/master |
| | 418 | git fetch upstream/master |
| 419 | 419 | git merge origin/master |
| 420 | 420 | git push origin master |
| 421 | 421 | |
diff --git a/docs/developer/component/build-component.md b/docs/developer/component/build-component.md
index 1b30a4ff6..c219b8feb 100644
|
a
|
b
|
class BP_Custom_Component extends BP_Component { |
| 113 | 113 | 'has_directory' => false, |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | | // BP Specigic globals. |
| | 116 | // BP Specific globals. |
| 117 | 117 | parent::setup_globals( $bp_globals ); |
| 118 | 118 | |
| 119 | 119 | // Your component's globals (if needed). |
diff --git a/docs/developer/group-extension/README.md b/docs/developer/group-extension/README.md
index 4212fd597..244e3f834 100644
|
a
|
b
|
_(optional)_ A multi-dimensional array of options related to the three secondary |
| 125 | 125 | |
| 126 | 126 | - `edit` – Config options for the ‘edit’ screen, a sub item of the Group's Manage item on the front-end. |
| 127 | 127 | - `submit_text` – The text of the submit button on the edit screen. Defaults to 'Edit'. |
| 128 | | - `enabled` – `true` if you want your group extension to have a subtab in the Group Adimn area, otherwise `false`. Defaults to `true`. |
| | 128 | - `enabled` – `true` if you want your group extension to have a subtab in the Group Admin area, otherwise `false`. Defaults to `true`. |
| 129 | 129 | - `name` – The text that appears in the navigation tab for the group extension’s Edit screen. Defaults to the general `name` value described above. |
| 130 | 130 | - `slug` – The string used to create the URL of the admin tab. Defaults to the general `slug` value described above. |
| 131 | 131 | - `screen_callback` – The function BuddyPress will call to display the content of your admin tab. BuddyPress attempts to determine this function automatically; |
| … |
… |
For the three “screen” contexts – `create`, `edit`, and `admin` – a flex |
| 175 | 175 | - `settings_screen()`: outputs the fallback markup for your `create` / `edit` / `admin` screens. |
| 176 | 176 | - `settings_screen_save()`: called after changes are submitted from the `create` / `edit` / `admin` screens. This method should contain the logic necessary to catch settings form submits, validate submitted settings, and save them to the database. |
| 177 | 177 | |
| 178 | | **NB**: these 2 methods include the `$group_id` argument so that you can customize your output/handler according to the current group being created, edited or adminstrated. |
| | 178 | **NB**: these 2 methods include the `$group_id` argument so that you can customize your output/handler according to the current group being created, edited or administrated. |
| 179 | 179 | |
| 180 | 180 | Let's improve our example of basic group extension including a feature to let the creator/administrator of the group decide whether they want to "activate" the group extension main tab for their group. |
| 181 | 181 | |
| … |
… |
$args = array( |
| 192 | 192 | 'nav_item_position' => 105, |
| 193 | 193 | 'access' => 'anyone', |
| 194 | 194 | |
| 195 | | // Set the callback function definining the `$show_tab` argument dynamically. |
| | 195 | // Set the callback function defining the `$show_tab` argument dynamically. |
| 196 | 196 | 'show_tab_callback' => array( $this, 'show_tab' ), |
| 197 | 197 | |
| 198 | 198 | // Define the screens using default screen settings. |