Skip to content

Commit

Permalink
some more name replacements
Browse files Browse the repository at this point in the history
  • Loading branch information
omarreiss committed Jul 14, 2015
1 parent e104b0a commit a437989
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Thanks for reading our contribution guidelines! What do you want to do:

* [File a bug / an issue](#filing-issue)
* [Security issues](#security)
* [Contribute to WordPress SEO](#contribute)
* [Contribute to Yoast SEO](#contribute)

<a name="filing-issue"></a>
#Filing issues
Expand All @@ -20,7 +20,7 @@ A useful bug report explains:
2. What you were expecting to happen.
3. What actually happened, illustrated with screenshots if possible.

Your bug report should also contain your WordPress version and if there are any errors, the _exact_ error text, including line numbers.
Your bug report should also contain your WordPress version and if there are any errors, the _exact_ error text, including line numbers.

### Blank / white screen
If you're getting a blank screen and you report just that, we can do _absolutely_ nothing. By default, your WordPress install suppresses all errors, to prevent information leaks, but we need those errors to be able to help you. If you apply the small piece of code in [this post on WP_DEBUG](https://yoast.com/wordpress-debug/) to your site, you should be able to open the URL that gave you a white screen, append `?debug=debug` to the URL and get the actual error.
Expand All @@ -35,9 +35,9 @@ If you're reporting a bug about specific interface elements not working as expec
Please do _not_ report security issues here, but email them to security at yoast dot com so we can deal with them securely and quickly.

<a name="contribute"></a>
#Contribute to WordPress SEO
#Contribute to Yoast SEO

Community made patches, localisations, bug reports and contributions are very welcome and help make WordPress SEO remains the #1 SEO plugin for WordPress.
Community made patches, localisations, bug reports and contributions are very welcome and help make Yoast SEO remains the #1 SEO plugin for WordPress.

When contributing please ensure you follow the guidelines below so that we can keep on top of things.

Expand All @@ -51,7 +51,7 @@ If there is no ticket for your issue, submit it first, following the above guide
* Make the changes to your forked repository.
* Ensure you stick to the [WordPress Coding Standards](http://make.wordpress.org/core/handbook/coding-standards/) and have properly documented any new functions, actions and filters following the [documentation standards](http://make.wordpress.org/core/handbook/inline-documentation-standards/php-documentation-standards/).
* When committing, reference your issue (if present) and include a note about the fix.
* Push the changes to your fork and submit a pull request to the 'trunk' branch of the WordPress SEO repository.
* Push the changes to your fork and submit a pull request to the 'trunk' branch of the Yoast SEO repository.

At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.

Expand All @@ -61,6 +61,6 @@ At this point you're waiting on us to merge your pull request. We'll review all
Some issues are labeled "Patch-welcome". This means we see the value in the particular enhancement being suggested but have decided for now not to prioritize it. If you however decide to write a patch for it we'll gladly include it after some code review.

# Additional Resources
* [WordPress SEO API](https://yoast.com/wordpress/plugins/seo/api/)
* [Yoast SEO API](https://yoast.com/wordpress/plugins/seo/api/)
* [General GitHub Documentation](http://help.github.com/)
* [GitHub Pull Request documentation](http://help.github.com/send-pull-requests/)
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ Yoast SEO
[![Stable Version](https://poser.pugx.org/yoast/wordpress-seo/v/stable.svg)](https://packagist.org/packages/yoast/wordpress-seo)
[![License](https://poser.pugx.org/yoast/wordpress-seo/license.svg)](https://packagist.org/packages/yoast/wordpress-seo)

Welcome to the WordPress SEO GitHub repository
Welcome to the Yoast SEO GitHub repository
----------------------------------------------

While the documentation for the [WordPress SEO plugin](https://yoast.com/wordpress/seo/) can be found on [Yoast.com](https://yoast.com/), here
While the documentation for the [Yoast SEO plugin](https://yoast.com/wordpress/seo/) can be found on [Yoast.com](https://yoast.com/), here
you can browse the source of the project, find and discuss open issues and even
[contribute yourself](https://github.com/yoast/wordpress-seo/blob/master/CONTRIBUTING.md).

Installation
------------

Here's a [guide on how to install WordPress SEO in your WordPress site](https://yoast.com/wordpress/seo/installation/).
Here's a [guide on how to install Yoast SEO in your WordPress site](https://yoast.com/wordpress/seo/installation/).

If you want to run the Git version for development though, you can set it up with [Composer](https://getcomposer.org/):

```bash
composer create-project yoast/wordpress-seo:dev-trunk --prefer-source --keep-vcs
```

Read more about [using Composer with WordPress SEO](https://github.com/Yoast/wordpress-seo/wiki/Using-Composer).
Read more about [using Composer with Yoast SEO](https://github.com/Yoast/wordpress-seo/wiki/Using-Composer).

This will download the latest development version of Yoast SEO. While this version is usually stable,
it is not recommended for use in a production environment.
Expand All @@ -44,7 +44,7 @@ It may help us a lot if you can provide a backtrace of the error encountered. Yo

Contributions
-------------
Anyone is welcome to contribute to WordPress SEO. Please
Anyone is welcome to contribute to Yoast SEO. Please
[read the guidelines](https://github.com/yoast/wordpress-seo/blob/master/CONTRIBUTING.md) for contributing to this
repository.

Expand Down
2 changes: 1 addition & 1 deletion css/xml-sitemap-xsl.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<div id="content">
<h1>XML Sitemap</h1>
<p class="expl">
Generated by <a href="https://yoast.com/">Yoast</a>\'s <a href="https://yoast.com/wordpress/plugins/seo/">WordPress SEO plugin</a>, this is an XML Sitemap, meant for consumption by search engines.<br/>
Generated by <a href="https://yoast.com/">Yoast</a> <a href="https://yoast.com/wordpress/plugins/seo/">SEO</a>, this is an XML Sitemap, meant for consumption by search engines.<br/>
You can find more information about XML sitemaps on <a href="http://sitemaps.org">sitemaps.org</a>.
</p>
<xsl:if test="count(sitemap:sitemapindex/sitemap:sitemap) &gt; 0">
Expand Down
6 changes: 3 additions & 3 deletions inc/wpseo-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ function wpseo_wpml_config( $config ) {
add_filter( 'icl_wpml_config_array', 'wpseo_wpml_config' );

/**
* WordPress SEO breadcrumb shortcode
* Yoast SEO breadcrumb shortcode
* [wpseo_breadcrumb]
*
* @return string
Expand Down Expand Up @@ -516,8 +516,8 @@ function wpseo_get_terms( $id, $taxonomy, $return_single = false ) {
* Generate an HTML sitemap
*
* @deprecated 1.5.5.4
* @deprecated use plugin WordPress SEO Premium
* @see WordPress SEO Premium
* @deprecated use plugin Yoast SEO Premium
* @see Yoast SEO Premium
*
* @param array $atts The attributes passed to the shortcode.
*
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wordpress-seo",
"description": "Development files for the WordPress SEO plugin",
"description": "Development files for the Yoast SEO plugin",
"plugin": {
"glotpress": "https://translate.yoast.com",
"textdomain": "wordpress-seo"
Expand Down
6 changes: 3 additions & 3 deletions phpdoc.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<phpdoc>
<title>WordPress SEO API Documentation</title>
<title>Yoast SEO API Documentation</title>
<parser>
<target>/Users/jdevalk/Code/docs/wordpress-seo</target>
<encoding>utf8</encoding>
<markers>
<item>TODO</item>
<item>FIXME</item>
</markers>
</markers>
</parser>
<transformer>
<target>/Users/jdevalk/Code/docs/wordpress-seo</target>
</transformer>
<transformations>
<template name="responsive"/>
</transformations>
</transformations>
<files>
<directory>.</directory>
<ignore>tests/*</ignore>
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
xdebug_disable();
}

echo 'Welcome to the WordPress SEO Test Suite' . PHP_EOL;
echo 'Welcome to the Yoast SEO Test Suite' . PHP_EOL;
echo 'Version: 1.0' . PHP_EOL . PHP_EOL;

if ( false !== getenv( 'WP_PLUGIN_DIR' ) ) {
Expand Down
6 changes: 3 additions & 3 deletions wp-seo.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/**
* Plugin Name: WordPress SEO
* Plugin Name: Yoast SEO
* Version: 2.2.1
* Plugin URI: https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin
* Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
Expand All @@ -16,7 +16,7 @@
*/

/**
* WordPress SEO Plugin
* Yoast SEO Plugin
* Copyright (C) 2008-2014, Yoast BV - [email protected]
*
* This program is free software: you can redistribute it and/or modify
Expand All @@ -43,5 +43,5 @@
define( 'WPSEO_FILE', __FILE__ );
}

// Load the WordPress SEO plugin.
// Load the Yoast SEO plugin.
require_once( dirname( __FILE__ ) . '/wp-seo-main.php' );

0 comments on commit a437989

Please sign in to comment.