diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/INSTALL.WINRT | 8 | ||||
| -rw-r--r-- | cpp/demo/IceGrid/secure/README | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/cpp/INSTALL.WINRT b/cpp/INSTALL.WINRT index 7ef7101398c..48f73ced6b3 100644 --- a/cpp/INSTALL.WINRT +++ b/cpp/INSTALL.WINRT @@ -51,8 +51,8 @@ you like. To build Ice for WinRT you first need to build Ice for Windows. Refer to INSTALL.WINDOWS for instructions on how to build Ice for -Windows. The build of Ice for Windows is required to compile the slice -translators which are required to build Ice for WinRT. +Windows. The build of Ice for Windows is necessary to create the Slice +translators that we need to build Ice for WinRT. Open a command prompt that is configured for your target architecture. For example, Visual Studio 2012 gives you several alternatives: @@ -63,7 +63,7 @@ For example, Visual Studio 2012 gives you several alternatives: - Visual Studio ARM Cross Tools Command Prompt Using the first configuration produces 32-bit binaries, while the -second and third produces 64-bit binaries and the fourth produces ARM +second and third produce 64-bit binaries and the fourth produces ARM binaries. Change the working directory to Ice-@ver@. For example: @@ -142,7 +142,7 @@ Debugger Tools are available at this link: http://msdn.microsoft.com/en-us/library/vstudio/bt727f1t.aspx Note: some tests might fail if you run the tests with the debugger -attached. You shoud choose "Start without Debugging" from the Debug +attached. You should choose "Start without Debugging" from the Debug menu to run the tests. diff --git a/cpp/demo/IceGrid/secure/README b/cpp/demo/IceGrid/secure/README index ee371e37d76..8b3802211f9 100644 --- a/cpp/demo/IceGrid/secure/README +++ b/cpp/demo/IceGrid/secure/README @@ -56,28 +56,28 @@ $ icegridadmin --Ice.Config=config.admin \ Alternatively, you can edit the config.admin file and uncomment the Ice.Default.Router property definition. -You can also manage this IceGrid deployment with the IceGrid Admin -graphical tool. +You can also manage this IceGrid deployment with the IceGrid Admin +graphical tool. -The IceSSL configuration in config.master, config.slave and +The IceSSL configuration in config.master, config.slave and config.glacier2 is: IceSSL.VerifyPeer=1 -which means that a client, such IceGrid Admin, does not need to -provide a X.509 certificate. As a result, connecting with IceGrid -Admin is straightforward: you just need to create a SSL connection -with no associated X.509 certificate. +which means that a client, such as IceGrid Admin, does not need to +provide an X.509 certificate. As a result, connecting with IceGrid +Admin is straightforward: you just need to create an SSL connection +with no associated X.509 certificate. -When using IceGrid Admin is recommended to import certs/certs.jks -in the IceGrid Admin trusted CAs Key Store using the IceGrid Admin -certificate manager, to ensure you IceGrid Admin connects to the -right IceGrid Registry or Glacier2 Router. +When using IceGrid Admin, we recommend importing certs/certs.jks +into the IceGrid Admin trusted CAs Key Store using the IceGrid Admin +certificate manager. This will ensure IceGrid Admin connects to the +correct IceGrid Registry or Glacier2 Router. The icegridadmin command line tool configuration in config.admin sets the property "IceSSL.CertAuthFile=ca_cert.pem" to ensure that the admin client is connecting to the correct registry or -glacier2router. In a Java client "IceSSL.Truststore=certs.jks" +glacier2router. In a Java client "IceSSL.Truststore=certs.jks" can be used for the same purpose. The IceGrid registry and Glacier2 router are configured to use the |