Merge pull request #9 from dotnet/alignment

Align authors display with docs.asp.net
dotnet · Jun 3, 2015 · bb09e50 · bb09e50
2 parents d012a51 + 13aedc4
commit bb09e50
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 112 deletions.
diff --git a/docs/_authors/daniel-roth.txt b/docs/_authors/daniel-roth.txt
diff --git a/docs/_authors/erik-reitan.txt b/docs/_authors/erik-reitan.txt
diff --git a/docs/_authors/noel-rice.txt b/docs/_authors/noel-rice.txt
diff --git a/docs/_authors/photos/Erik-Reitan.jpg b/docs/_authors/photos/Erik-Reitan.jpg
diff --git a/docs/_authors/photos/daniel-roth.jpg b/docs/_authors/photos/daniel-roth.jpg
diff --git a/docs/_authors/photos/noel-rice.jpg b/docs/_authors/photos/noel-rice.jpg
diff --git a/docs/_authors/photos/pranav-rastogi.jpg b/docs/_authors/photos/pranav-rastogi.jpg
diff --git a/docs/_authors/photos/rick-anderson.jpg b/docs/_authors/photos/rick-anderson.jpg
diff --git a/docs/_authors/photos/steve-smith.jpg b/docs/_authors/photos/steve-smith.jpg
diff --git a/docs/_authors/photos/venkata-koppaka.jpg b/docs/_authors/photos/venkata-koppaka.jpg
diff --git a/docs/_authors/pranav-rastogi.txt b/docs/_authors/pranav-rastogi.txt
diff --git a/docs/_authors/rick-anderson.txt b/docs/_authors/rick-anderson.txt
diff --git a/docs/_authors/steve-smith.txt b/docs/_authors/steve-smith.txt
diff --git a/docs/_authors/venkata-koppaka.txt b/docs/_authors/venkata-koppaka.txt
diff --git a/docs/authors.txt b/docs/authors.txt
@@ -0,0 +1,11 @@
+.. _Rich Lander: https://github.com/richlander
+.. _Kasey Uhlenhuth: https://github.com/kuhlenh
+.. _Steve Smith: http://blog.falafel.com/author/steve-smith/
+.. _Noel Rice: http://blog.falafel.com/author/noel-rice/
+.. _Venkata Koppaka: http://blog.falafel.com/author/venkata-koppaka/
+.. _Mike Wasson: https://github.com/mikewasson
+.. _Erik Reitan: https://github.com/Erikre
+.. _Pranav Rastogi: https://github.com/rustd
+.. _Daniel Roth: https://github.com/danroth27
+.. _Zlatko Knezevic: https://github.com/blackdwarf
+.. _Vance Morrison: https://github.com/vancem
diff --git a/docs/concepts/intro-clr.rst b/docs/concepts/intro-clr.rst
@@ -1,7 +1,7 @@
 Introduction to the Common Language Runtime (CLR)
 =================================================
 
-By Vance Morrison ([@vancem](https://github.com/vancem)) - 2007
+By `Vance Morrison`_ - 2007
 
 What is the Common Language Runtime (CLR)? To put it succinctly:
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -104,6 +104,13 @@
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 
+rst_prolog = """
+.. raw:: html
+
+	<noscript><img alt="" width="1" height="1" src="https://c.microsoft.com/trans_pixel.aspx"/></noscript>
+
+.. include:: /authors.txt
+"""
 
 # -- Options for HTML output ----------------------------------------------
 

diff --git a/docs/dnx/console.rst b/docs/dnx/console.rst
@@ -1,13 +1,14 @@
 Creating a Cross-Platform Console App with DNX
 ==============================================
-By :ref:`Steve Smith <console-author>` | Originally Published: 28 April 2015 
+By `Steve Smith`_
+
 Using the .NET Execution environment (DNX), it's very easy to run a simple console application.
 
 In this article:
 	- `Creating a Console App`_
 	- `Specifying Project Settings`_
 	- `Running the App`_
-	
+
 You can `view and download the source <https://github.com/aspnet/Docs/tree/master/samples/CreatingConsoleAppWithDNX>`_ from the project created in this article.
 
 Creating a Console App
@@ -24,7 +25,7 @@ Creating a console application is extremely straightforward. For this article, w
 .. literalinclude:: console/sample/Program.cs
 	:linenos:
 	:language: c#
-	
+
 It really doesn't get any simpler than this. Create a file with these contents and save it as ``Program.cs`` in your current folder.
 
 Specifying Project Settings
@@ -61,7 +62,3 @@ Summary
 -------
 
 Creating and running your first console application on DNX is very simple, and only requires two files.
-
-.. _console-author:
-
-.. include:: /_authors/steve-smith.txt
diff --git a/docs/dnx/overview.rst b/docs/dnx/overview.rst
@@ -1,6 +1,6 @@
 DNX Overview
 ====================================
-By :ref:`Daniel Roth <dnx-author>` | Updated : 28 April 2015
+By `Daniel Roth`_
 
 What is the .NET Execution Environment?
 ---------------------------------------------
@@ -162,7 +162,3 @@ DNX Version Manager
 You can install multiple DNX versions and flavors on your machine. To install and manage different DNX versions and flavors you use the .NET Version Manager (DNVM). DNVM lets you list the different DNX versions and flavors on your machine, install new ones and switch the active DNX.
 
 See :doc:`/getting-started/index` for instructions on how to acquire and install DNVM for your platform.
-
-.. _dnx-author:
-
-.. include:: /_authors/daniel-roth.txt
diff --git a/docs/getting-started/installing-core-linux.rst b/docs/getting-started/installing-core-linux.rst
@@ -1,7 +1,7 @@
-.. include:: /stub-topic.txt
-
 Installing .NET Core on Linux
 =========================================
+By `Zlatko Knezevic`_
+
 
 These instructions will lead you through acquiring the .NET Core DNX SDK
 via the `.NET Version Manager (DNVM) <https://github.com/aspnet/dnvm>`__

diff --git a/docs/getting-started/installing-core-osx.rst b/docs/getting-started/installing-core-osx.rst
@@ -1,7 +1,6 @@
-.. include:: /stub-topic.txt
-
 Installing .NET Core on OS X
 ==============================
+By `Zlatko Knezevic`_
 
 These instructions will lead you through acquiring the .NET Core DNX SDK
 via the `.NET Version Manager (DNVM) <https://github.com/aspnet/dnvm>`__

diff --git a/docs/getting-started/installing-core-windows.rst b/docs/getting-started/installing-core-windows.rst
@@ -1,7 +1,6 @@
-.. include:: /stub-topic.txt
-
 Installing .NET Core on Windows
 ===============================
+By `Zlatko Knezevic`_
 
 This document will lead you through acquiring the .NET Core DNX SDK via the `.NET Version Manager (DNVM) <https://github.com/aspnet/dnvm>`_ and running a "Hello World" demo on Windows.