Merge pull request MicrosoftDocs#61 from MicrosoftDocs/master

Merge master to live

Author: muwaqar

officewebapps/docfx.json

@@ -54,10 +54,10 @@
     "externalReference": [],
     "globalMetadata": {
       "author" : "kenwith",
-      "ms.author" : "kenwith",
-      "ms.date" : "09/25/2017",
+      "ms.author" : "mikeplum",
+      "ms.date" : "11/28/2017",
       "ms.topic" : "reference",
-      "ms.service" : "officewebapps-powershell",
+      "ms.prod" : "office-online-server-powershell",
       "ms.devlang" : "powershell"
     },
     "fileMetadata": {},

officewebapps/officewebapps-ps/officewebapps/Get-OfficeWebAppsExcelBIServer.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Get-OfficeWebAppsExcelBIServer
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Get-OfficeWebAppsExcelUserDefinedFunction.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Get-OfficeWebAppsExcelUserDefinedFunction
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Get-OfficeWebAppsFarm.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Get-OfficeWebAppsFarm
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Get-OfficeWebAppsHost.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Get-OfficeWebAppsHost
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Get-OfficeWebAppsMachine.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Get-OfficeWebAppsMachine
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/New-OfficeWebAppsExcelBIServer.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: New-OfficeWebAppsExcelBIServer
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/New-OfficeWebAppsExcelUserDefinedFunction.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: New-OfficeWebAppsExcelUserDefinedFunction
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/New-OfficeWebAppsFarm.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: New-OfficeWebAppsFarm
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/New-OfficeWebAppsHost.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: New-OfficeWebAppsHost
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/New-OfficeWebAppsMachine.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: New-OfficeWebAppsMachine
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Remove-OfficeWebAppsExcelBIServer.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Remove-OfficeWebAppsExcelBIServer
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Remove-OfficeWebAppsExcelUserDefinedFunction.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Remove-OfficeWebAppsExcelUserDefinedFunction
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Remove-OfficeWebAppsHost.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Remove-OfficeWebAppsHost
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Remove-OfficeWebAppsMachine.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Remove-OfficeWebAppsMachine
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Repair-OfficeWebAppsFarm.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Repair-OfficeWebAppsFarm
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Set-OfficeWebAppsExcelUserDefinedFunction.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Set-OfficeWebAppsExcelUserDefinedFunction
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Set-OfficeWebAppsFarm.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Set-OfficeWebAppsFarm
 online version:
 schema: 2.0.0
 ---

officewebapps/officewebapps-ps/officewebapps/Set-OfficeWebAppsMachine.md

@@ -1,6 +1,7 @@
 ---
 external help file:
 Module Name: officewebapps
+title: Set-OfficeWebAppsMachine
 online version:
 schema: 2.0.0
 ---

sharepoint/docfx.json

@@ -53,14 +53,20 @@
     "overwrite": [],
     "externalReference": [],
     "globalMetadata": {
-      "author" : "kenwith",
-      "ms.author" : "kenwith",
-      "ms.date" : "09/25/2017",
+      "author" : "techwriter40",
+      "ms.author" : "kirks",
+      "ms.date" : "11/28/2017",
       "ms.topic" : "reference",
-      "ms.service" : "sharepoint-powershell",
       "ms.devlang" : "powershell"
     },
-    "fileMetadata": {},
+    "fileMetadata": {
+      "ms.service":{
+        "sharepoint-online/*.md":"sharepoint-powershell"
+      },
+      "ms.prod":{
+        "sharepoint-server/*.md":"sharepoint-2016-powershell"
+      }
+    },
     "template": [],
     "dest": "sharepoint-ps"
   }

sharepoint/docs-conceptual/intro.md

@@ -4,9 +4,9 @@ Microsoft PowerShell is a command-line shell and scripting language that provide
 
 By default,  Powershell is located at the following path:  <%SystemRoot%>\System32\WindowsPowerShell\v1.0\PowerShell.exe.
 
-For a list of SharePoint Server on-premises cmdlets, see [SharePoint Server cmdlets](sharepoint-server.md)
+For a list of SharePoint Server on-premises cmdlets, see [SharePoint Server cmdlets](sharepoint-server\sharepoint-server-cmdlets.md)
 
-For a list of SharePoint Online cmdlets, see [SharePoint Online cmdlets](sharepoint-online.md)
+For a list of SharePoint Online cmdlets, see [SharePoint Online cmdlets](sharepoint-online\sharepoint-online-cmdlets.md)
 
 ## Accessing PowerShell for SharePoint Server ##
 
@@ -30,7 +30,7 @@ Before you can use the Add-SPShellAdmin cmdlet to grant permissions for users to
 
 **NOTE:** If these permissions are not satisfied, contact your Setup administrator or SQL Server administrator to request these permissions.
 
-For additional information about PowerShell permissions, see [Add-SPShellAdmin](Add-SPShellAdmin.md).
+For additional information about PowerShell permissions, see [Add-SPShellAdmin](../sharepoint-ps/sharepoint-server/Add-SPShellAdmin.md).
 
 If you do not have membership in the **SharePoint_Shell_Access** role or **WSS_Admin_WPG** local group, use the **Add-SPShellAdmin** cmdlet to add the **WSS_Admin_WPG** group in all front-end web servers in the SharePoint farm and the **SharePoint_Shell_Access** role. If the SQL Server database does not have a **SharePoint_Shell_Access** role, the role is automatically created when you run the **Add-SPShellAdmin** cmdlet. After you run the **Add-SPShellAdmin** cmdlet, users can run SharePoint PowerShell cmdlets in a multiple-server farm environment.
 

sharepoint/docs-conceptual/overview.md

@@ -0,0 +1,35 @@
+Before you get started using PowerShell to manage SharePoint Online, make sure that the SharePoint Online Management Shell is installed and you have connected to SharePoint Online.
+
+Install the SharePoint Online Management Shell by downloading and running the [SharePoint Online Management Shell](https://go.microsoft.com/fwlink/p/?LinkId=255251). You only need to do this once for each computer from which you are running SharePoint Online PowerShell commands.
+
+To open the SharePoint Online Management Shell command prompt, from the **Start** screen, type **sharepoint**, and then click **SharePoint Online Management Shell**.
+
+#### To connect with a user name and password  ####
+
+1. Fill in the values for the **$adminUPN** and **$orgName** variables (replacing all the text between the quotes, including the < and > characters), and then run the following commands at the SharePoint Online Management Shell command prompt:
+
+```
+$adminUPN="<the full email address of a SharePoint administrator account, example: [email protected]>"
+$orgName="<name of your Office 365 organization, example: contosotoycompany>"
+$userCredential = Get-Credential -UserName $adminUPN -Message "Type the password."
+Connect-SPOService -Url https://$orgName-admin.sharepoint.com -Credential $userCredential
+
+```
+
+2. When prompted with the Windows PowerShell credential request dialog box, type the password for the SharePoint Online SharePoint administrator account.
+
+To make a user account a SharePoint administrator, see [Assign admin roles in Office 365 for business](https://support.office.com/en-us/article/Assign-admin-roles-in-Office-365-for-business-eac4d046-1afd-4f1a-85fc-8219c79e1504?ui=en-US&rs=en-US&ad=US) or [Assign roles to user accounts with Office 365 PowerShell](https://technet.microsoft.com/library/mt736914.aspx).
+
+#### To connect with multifactor authentication (MFA) ####
+
+1. Fill in the value for the **$orgName** variable (replacing all the text between the quotes, including the < and > characters), and then run the following commands at the SharePoint Online Management Shell command prompt:
+
+```
+$orgName="<name of your Office 365 organization, example: contosotoycompany>"
+Connect-SPOService -Url https://$orgName-admin.sharepoint.com
+```
+2. When prompted with the **Microsoft SharePoint Online Management Shell** dialog box, type the account name and password for a SharePoint administrator account, and then click **Sign in**.
+
+3. Follow the instructions in the **Microsoft SharePoint Online Management Shell** dialog box to provide the additional authentication information, such as a verification code, and then click **Sign in**.
+
+You are now ready to use SharePoint Online commands.

sharepoint/docs-conceptual/sharepoint-online-cmdlets.md

@@ -0,0 +1,28 @@
+# What is the SharePoint Online Management Shell? #
+
+The SharePoint Online Management Shell is a Windows PowerShell module that you can use to manage SharePoint Online users, sites, and site collections. Command-line operations in Windows PowerShell are composed of a series of commands. Each command uses a cmdlet and a set of settings known as parameters. For example, you use the **New-SPOSite** cmdlet for a command that creates a new SharePoint Online site with a specified title, URL, owner, storage quota, and template (the parameters).
+
+SharePoint Online PowerShell commands can be very efficient for batch operations — for example, creating a dozen new sites or adding hundreds of new SharePoint Online users to a site. For more information, see [Why you need to use Office 365 PowerShell](https://technet.microsoft.com/library/dn568034.aspx).
+
+#### What is the difference between SharePoint Online PowerShell commands and Office 365 PowerShell commands? ####
+
+The major and obvious difference is the nouns they use. Every SharePoint Online cmdlet will start with SPO as its noun. Conversely, Office 365 will start with MSO as it noun. 
+
+The set of SharePoint Online Management Shell commands differs from the set of Office 365 for professionals and small businesses PowerShell commands. SharePoint Online Management Shell commands manage SharePoint Online users and sites, whereas Office 365 commands manage Office 365-level tasks such as users, licenses, organization information, and services. They both manage users and groups. However, Office 365 PowerShell commands manage users and groups for all of the Office 365 services. The  SharePoint Online commands manage users and groups only for SharePoint Online.
+
+#### Should I use the SharePoint Online Admin Center or SharePoint Online PowerShell commands? ####
+
+If you are new to Office 365 and SharePoint Online and you have not done much managing of SharePoint sites or users, the SharePoint Online Administration Center is a good place to start. 
+
+After you get familiar with SharePoint Online sites and users, try using SharePoint Online commands, especially when you want to manage lots of users, sites, or site collections.
+
+# How do I get permissions and set up the environment? #
+
+To use SharePoint Online PowerShell commands, you must be a SharePoint Online global administrator.
+
+Before you can run SharePoint Online commands, you must install the SharePoint Online Management Shell module and connect to the SharePoint Online service. For more information, see [Connect SharePoint Online](connect-sharepoint-online.md)
+
+
+
+
+

sharepoint/docs-conceptual/sharepoint-online/connect-sharepoint-online.md

@@ -0,0 +1,3 @@
+#SharePoint Online Cmdlets
+
+For a listing of the SharePoint Online cmdlets, see [SharePoint Online cmdlets](sharepoint-online.md).