From 4d377dd4a1f7bcf0e9d46f74d2f6c5ee1e940f01 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 29 Sep 2015 11:15:26 +0000
Subject: [PATCH] On the Permalink Settings screen, add a link to the Nginx
 documentation when the current site is running Nginx. This is in lieu of
 showing actual Nginx configuration like we do for mod_rewrite or IIS.

Fixes #18852

Built from https://develop.svn.wordpress.org/trunk@34691


git-svn-id: http://core.svn.wordpress.org/trunk@34655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-permalink.php | 4 +++-
 wp-includes/version.php        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 7af1e98a22..f77684129a 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -251,7 +251,9 @@ printf( __('If you like, you may enter custom structures for your category and t
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
-<?php elseif ( ! $is_nginx ) :
+<?php elseif ( $is_nginx ) : ?>
+	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
+<?php else:
 	if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c08e6bdb32..b025fc1a05 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34690';
+$wp_version = '4.4-alpha-34691';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.