Merge remote-tracking branch 'origin/cygwin-1.0-typos' into cygwin

windows/babeld/cyginet.c

@@ -172,7 +172,7 @@ static int
 get_interface_forwards(char * guid)
 {
   long value = 0;
-  /* Location in the Windows XP, not sure in Vista or Windows 7 */
+  /* Location in Windows XP, not sure in Vista or Windows 7 */
   char * key = "SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters"
                "\\Interfaces\\%s";
   char * name = "Forwards";
@@ -449,7 +449,7 @@ libwinet_run_command(const char *command)
  *
  *   Gateway could be an address or interface name.
  *
- *   In the Windows 7, there is a little difference:
+ *   In Windows 7, there is a little difference:
  *
  *       Destination Prefix:     ::/0
  *       Source Prefix:          ::/0
@@ -510,7 +510,7 @@ libwinet_dump_ipv6_route_table(struct cyginet_route *routes,
       *p -- = 0;
 
     /* The first field of route entry
-       In the Windows XP, field name is "prefix",
+       In Windows XP, field name is "prefix",
        Windows 7, "Destination Prefix"
        */
     if ((strncmp(buffer, "Prefix", 6) == 0) ||
@@ -1091,7 +1091,7 @@ libwinet_edit_route_entry(const struct sockaddr *dest,
     memset(&Row2, 0, sizeof(MIB_IPFORWARD_ROW2));
 
     /* Row2.InterfaceLuid = 0; */
-    /* Maybe in the Vista, both of indexs are same. */
+    /* Maybe in Vista, both indexes are the same. */
     Row2.InterfaceIndex = dest->sa_family == AF_INET6 ?
       ifindex : libwinet_map_ifindex(AF_INET6, ifindex);
     Row2.DestinationPrefix.PrefixLength = plen;
@@ -1571,7 +1571,7 @@ cyginet_getifaddresses(char *ifname,
   return dwReturn;
 }
 
-/* In the windows, loopback interface index is alawys 1 */
+/* In windows, loopback interface index is alawys 1 */
 int
 cyginet_loopback_index(int family)
 {
@@ -1579,7 +1579,7 @@ cyginet_loopback_index(int family)
 }
 
 /*
- * There are 3 ways to dump route table in the Windows:
+ * There are 3 ways to dump route table in Windows:
  *
  * Before Windows Vista
  *
@@ -2675,7 +2675,7 @@ VOID PrintAllInterfaces()
 static void
 runTestCases()
 {
-  printf("\n\nTest getifaddrs works in the Cygwin:\n\n");
+  printf("\n\nTest getifaddrs works in Cygwin:\n\n");
   {
     struct ifaddrs * piftable, *pif;
     getifaddrs(&piftable);
@@ -2684,7 +2684,7 @@ runTestCases()
     freeifaddrs(piftable);
   }
 
-  printf("\n\nTest if_indexname works in the Cygwin:\n\n");
+  printf("\n\nTest if_indexname works in Cygwin:\n\n");
   {
     struct if_nameindex * ptr = (struct if_nameindex *)if_nameindex();
     if (ptr) {
@@ -2697,7 +2697,7 @@ runTestCases()
     }
   }
 
-  printf("\n\nTest if_indextoname works in the Cygwin:\n\n");
+  printf("\n\nTest if_indextoname works in Cygwin:\n\n");
   {
     CHAR ifname[256];
     if (if_indextoname(1, ifname))
@@ -2706,7 +2706,7 @@ runTestCases()
       printf("if_indextoname failed\n");
   }
 
-  printf("\n\nTest cyginet_ifname works in the Cygwin:\n\n");
+  printf("\n\nTest cyginet_ifname works in Cygwin:\n\n");
   {
     struct if_nameindex * ptr = (struct if_nameindex *)if_nameindex();
     if (ptr) {
@@ -2728,7 +2728,7 @@ runTestCases()
            );
   }
   */
-  printf("\n\nTest cyginet_guidname works in the Cygwin:\n\n");
+  printf("\n\nTest cyginet_guidname works in Cygwin:\n\n");
   {
     PLIBWINET_INTERFACE_MAP_TABLE p = g_interface_map_table;
     while (p) {

windows/babeld/cyginet.h

@@ -92,7 +92,7 @@
   http://msdn.microsoft.com/en-us/library/aa921042.aspx
 
   TCP/IP (v4 and v6) Technical Reference, it shows ipv4 and ipv6 how
-  to work in the windows. (Recommended)
+  to work in windows. (Recommended)
   http://technet.microsoft.com/en-us/library/dd379473(v=ws.10).aspx
  */
 
@@ -103,7 +103,7 @@
 #define IN_LOOPBACK(a)      ((((long int) (a)) & 0xff000000) == 0x7f000000)
 #endif
 
-/* Missing defines in the Cygwin */
+/* Missing defines in Cygwin */
 #define RTM_ADD		0x1	/* Add Route */
 #define RTM_DELETE	0x2	/* Delete Route */
 #define RTM_CHANGE	0x3	/* Change Metrics or flags */

windows/babeld/kernel_cygwin.c

@@ -101,7 +101,7 @@ static int kernel_pipe_handles[2];
  * forward- ing of IPv6 packets.  Also, identify if the node is
  * acting as a router.  Defaults to off.
  *
- * ==> In the Windows, MSDN says in the registry
+ * ==> In Windows, MSDN says in the registry
  *
  * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters
  *
@@ -156,7 +156,7 @@ kernel_setup(int setup)
         if (0 != cyginet_startup())
             return -1;
 
-        /* We don't disable ICMPv6 redirect in the Windows */
+        /* We don't disable ICMPv6 redirect in Windows */
         /*
         if ((rc = cyginet_set_icmp6_redirect_accept(0)) == -1) {
             fprintf(stderr, "Cannot disable ICMPv6 redirect.\n");
@@ -288,7 +288,7 @@ clear_kernel_socket_event()
  *
  * RTF_CLONING: generate new routes on use
  *
- *   Not implemented in the Windows.
+ *   Not implemented in Windows.
  *
  */
 int
@@ -564,7 +564,7 @@ kernel_routes(struct kernel_route *routes, int maxroutes)
 }
 
 /* Note: ifname returned by getifaddrs maybe includes a suffix number
-   in the Cygwin, it looks like:
+   in Cygwin, it looks like:
 
    {C05BAB6E-B82D-4C4D-AF07-EFF7C45C5DB0}_1
    {C05BAB6E-B82D-4C4D-AF07-EFF7C45C5DB0}_2
@@ -697,7 +697,7 @@ kernel_callback(int (*fn)(int, void*), void *closure)
 {
     if (kernel_socket < 0) kernel_setup_socket(1);
 
-    /* In the Windows, we can't get the exact changed route, but the
+    /* In Windows, we can't get the exact changed route, but the
        route table is really changed. */
     kdebugf("Kernel table changed.\n");
     cyginet_refresh_interface_table();

windows/babeld/net.c

@@ -51,7 +51,7 @@ babel_socket(int port)
 
     /* When this value is nonzero (the default on Windows), a socket
        created for the AF_INET6 address family can be used to send and
-       receive IPv6 packets only.  So it's not require to set in the
+       receive IPv6 packets only.  So it's not required to set in
        Windows XP. Actualy, this socket option is only supported on
        Windows Vista or later. */
 #if !defined(_WIN32_WINNT) || _WIN32_WINNT >= 0x0600

windows/docs/using-slapos-in-windows.html

-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Using SlapOS in the Windows</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" title="Using SlapOS in the Windows"><div class="titlepage"><div><div><h1 class="title"><a name="id9228154"></a>Using SlapOS in the Windows</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Jondy</span> <span class="surname">Zhao</span></h3></div></div><div><div class="revhistory"><table border="1" width="100%" summary="Revision history"><tr><th align="left" valign="top" colspan="3"><b>Revision History</b></th></tr><tr><td align="left">Revision 0.4</td><td align="left">2013-08-01</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add chapter Create SlapOS Windows Installer Bootstrip Node.</td></tr><tr><td align="left">Revision 0.3</td><td align="left">2013-07-11</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add chapter SlapOS Sources Changed  For Windows.</td></tr><tr><td align="left">Revision 0.2</td><td align="left">2013-07-05</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add Cron Service and Know Issues section, fix some problems in the chapter Generating windows installer from sources.</td></tr><tr><td align="left">Revision 0.1</td><td align="left">2013-06-20</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Create the document.</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#ch_introduction">1. Introduction</a></span></dt><dt><span class="chapter"><a href="#ch_install_slapos">2. Installing SlapOS node in the Windows</a></span></dt><dt><span class="chapter"><a href="#id9246907">3. Using Slapos in the Windows</a></span></dt><dd><dl><dt><span class="section"><a href="#sec_configure_slapos">3.1. Configure SlapOS</a></span></dt><dt><span class="section"><a href="#id9256148">3.2. SlapOS Node</a></span></dt><dt><span class="section"><a href="#id9256169">3.3. SlapOS</a></span></dt><dt><span class="section"><a href="#id9256184">3.4. SlapOS Runner</a></span></dt><dt><span class="section"><a href="#id9256208">3.5. Command Console</a></span></dt><dt><span class="section"><a href="#id9256241">3.6. User Guide</a></span></dt><dt><span class="section"><a href="#id9256250">3.7. Cron Service</a></span></dt><dt><span class="section"><a href="#id9256274">3.8. Known issues</a></span></dt></dl></dd><dt><span class="chapter"><a href="#ch_generate_window_installer">4. Generating windows installer from sources</a></span></dt><dd><dl><dt><span class="section"><a href="#id9256391">4.1. Setting Up Cygwin</a></span></dt><dt><span class="section"><a href="#id9256571">4.2. Building SlapOS</a></span></dt><dt><span class="section"><a href="#id9256631">4.3. Preparing the sources files for installer</a></span></dt><dt><span class="section"><a href="#id9256823">4.4. Making installer</a></span></dt></dl></dd><dt><span class="chapter"><a href="#ch_run_slapos_from_sources">5. Run SlapOS From Sources</a></span></dt><dt><span class="chapter"><a href="#id9256959">6. SlapOS Sources Changed  For Windows</a></span></dt><dd><dl><dt><span class="section"><a href="#id9257062">6.1. How to upgrade the sources</a></span></dt><dt><span class="section"><a href="#id9257111">6.2. How to upgrade installer</a></span></dt><dt><span class="section"><a href="#id9257121">6.3. Merge sources to master branch</a></span></dt></dl></dd><dt><span class="chapter"><a href="#id9257144">7. Create SlapOS Windows Installer Bootstrip Node</a></span></dt><dd><dl><dt><span class="section"><a href="#id9257187">7.1. Add SlapOS Bootstrip Node to Vifib Cluster</a></span></dt></dl></dd><dt><span class="appendix"><a href="#appendix_cygwin_packages">A. Cygwin Required Packages List</a></span></dt></dl></div><div class="chapter" title="Chapter1.Introduction"><div class="titlepage"><div><div><h2 class="title"><a name="ch_introduction"></a>Chapter1.Introduction</h2></div></div></div><p>SlapOS can be described as a cloud operating system in which "everything is a process" unlike Unix in which "everything is a file". If one has to manage thousands of servers with thousands of processes, hundred different applications in multiple different releases or versions, SlapOS can help you a lot by making the whole management process well specified, automated and under control.</p><p>The goal of this tutorial is to teach how to use SlapOS in the windows.</p></div><div class="chapter" title="Chapter2.Installing SlapOS node in the Windows"><div class="titlepage"><div><div><h2 class="title"><a name="ch_install_slapos"></a>Chapter2.Installing SlapOS node in the Windows</h2></div></div></div><p>At first, we need to sign up in VIFIB community Cloud by clicking here <a class="ulink" href="https://www.slapos.org/login_form" target="_top">https://www.slapos.org/login_form</a></p><p>Then download the latest slapos windows installer from <a class="ulink" href="http://www.erp5.org/dists/installer" target="_top">http://www.erp5.org/dists/installer</a>, the filename of windows installer look like slapos-XXX-windows-YYY-all-in-one.exe or slapos-XXX-windows-YYY.exe, XXX stands for version-release information. YYY could be X86 or x64, the former means 32-bit, the latter 64-bit windows. The all-in-one installer include all the files required by slapos node, so it can run in the computer which doesn't access internat; the later will download most of packages from internet and build, so it need more time than all-in-one installer. It's recommanded to use the former installer in case of slow or unstable internet even if the size of all-in-one installer is more than 100MB, compare of the latter which size is about 2MB.</p><p>Double click the installer, click Next, Next ...
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Using SlapOS in the Windows</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" title="Using SlapOS in the Windows"><div class="titlepage"><div><div><h1 class="title"><a name="id9228154"></a>Using SlapOS in the Windows</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Jondy</span> <span class="surname">Zhao</span></h3></div></div><div><div class="revhistory"><table border="1" width="100%" summary="Revision history"><tr><th align="left" valign="top" colspan="3"><b>Revision History</b></th></tr><tr><td align="left">Revision 0.4</td><td align="left">2013-08-01</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add chapter Create SlapOS Windows Installer Bootstrap Node.</td></tr><tr><td align="left">Revision 0.3</td><td align="left">2013-07-11</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add chapter SlapOS Sources Changed  For Windows.</td></tr><tr><td align="left">Revision 0.2</td><td align="left">2013-07-05</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Add Cron Service and Know Issues section, fix some problems in the chapter Generating windows installer from sources.</td></tr><tr><td align="left">Revision 0.1</td><td align="left">2013-06-20</td><td align="left">Jondy Zhao - jondy.zhao@nexedi.com</td></tr><tr><td align="left" colspan="3">Create the document.</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#ch_introduction">1. Introduction</a></span></dt><dt><span class="chapter"><a href="#ch_install_slapos">2. Installing SlapOS node in the Windows</a></span></dt><dt><span class="chapter"><a href="#id9246907">3. Using Slapos in the Windows</a></span></dt><dd><dl><dt><span class="section"><a href="#sec_configure_slapos">3.1. Configure SlapOS</a></span></dt><dt><span class="section"><a href="#id9256148">3.2. SlapOS Node</a></span></dt><dt><span class="section"><a href="#id9256169">3.3. SlapOS</a></span></dt><dt><span class="section"><a href="#id9256184">3.4. SlapOS Runner</a></span></dt><dt><span class="section"><a href="#id9256208">3.5. Command Console</a></span></dt><dt><span class="section"><a href="#id9256241">3.6. User Guide</a></span></dt><dt><span class="section"><a href="#id9256250">3.7. Cron Service</a></span></dt><dt><span class="section"><a href="#id9256274">3.8. Known issues</a></span></dt></dl></dd><dt><span class="chapter"><a href="#ch_generate_window_installer">4. Generating windows installer from sources</a></span></dt><dd><dl><dt><span class="section"><a href="#id9256391">4.1. Setting Up Cygwin</a></span></dt><dt><span class="section"><a href="#id9256571">4.2. Building SlapOS</a></span></dt><dt><span class="section"><a href="#id9256631">4.3. Preparing the sources files for installer</a></span></dt><dt><span class="section"><a href="#id9256823">4.4. Making installer</a></span></dt></dl></dd><dt><span class="chapter"><a href="#ch_run_slapos_from_sources">5. Run SlapOS From Sources</a></span></dt><dt><span class="chapter"><a href="#id9256959">6. SlapOS Sources Changed  For Windows</a></span></dt><dd><dl><dt><span class="section"><a href="#id9257062">6.1. How to upgrade the sources</a></span></dt><dt><span class="section"><a href="#id9257111">6.2. How to upgrade installer</a></span></dt><dt><span class="section"><a href="#id9257121">6.3. Merge sources to master branch</a></span></dt></dl></dd><dt><span class="chapter"><a href="#id9257144">7. Create SlapOS Windows Installer Bootstrap Node</a></span></dt><dd><dl><dt><span class="section"><a href="#id9257187">7.1. Add SlapOS Bootstrap Node to Vifib Cluster</a></span></dt></dl></dd><dt><span class="appendix"><a href="#appendix_cygwin_packages">A. Cygwin Required Packages List</a></span></dt></dl></div><div class="chapter" title="Chapter1.Introduction"><div class="titlepage"><div><div><h2 class="title"><a name="ch_introduction"></a>Chapter1.Introduction</h2></div></div></div><p>SlapOS can be described as a cloud operating system in which "everything is a process" unlike Unix in which "everything is a file". If one has to manage thousands of servers with thousands of processes, hundred different applications in multiple different releases or versions, SlapOS can help you a lot by making the whole management process well specified, automated and under control.</p><p>The goal of this tutorial is to teach how to use SlapOS in the windows.</p></div><div class="chapter" title="Chapter2.Installing SlapOS node in the Windows"><div class="titlepage"><div><div><h2 class="title"><a name="ch_install_slapos"></a>Chapter2.Installing SlapOS node in the Windows</h2></div></div></div><p>At first, we need to sign up in VIFIB community Cloud by clicking here <a class="ulink" href="https://www.slapos.org/login_form" target="_top">https://www.slapos.org/login_form</a></p><p>Then download the latest slapos windows installer from <a class="ulink" href="http://www.erp5.org/dists/installer" target="_top">http://www.erp5.org/dists/installer</a>, the filename of windows installer look like slapos-XXX-windows-YYY-all-in-one.exe or slapos-XXX-windows-YYY.exe, XXX stands for version-release information. YYY could be X86 or x64, the former means 32-bit, the latter 64-bit windows. The all-in-one installer include all the files required by slapos node, so it can run in the computer which doesn't access internat; the later will download most of packages from internet and build, so it need more time than all-in-one installer. It's recommanded to use the former installer in case of slow or unstable internet even if the size of all-in-one installer is more than 100MB, compare of the latter which size is about 2MB.</p><p>Double click the installer, click Next, Next ...
 </p><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>If the current user isn't Administrator, you need run it as Administrator. Right click the installer, then click Run As Administrator.</p></div><p>
 </p><p>At the final wizard page, click Install.</p><p>Waiting for everything done.</p><p>If you prefer to install slapos node from sources, refer to the chapter <a class="xref" href="#ch_run_slapos_from_sources" title="Chapter5.Run SlapOS From Sources">Chapter5, <i>Run SlapOS From Sources</i></a>.</p></div><div class="chapter" title="Chapter3.Using Slapos in the Windows"><div class="titlepage"><div><div><h2 class="title"><a name="id9246907"></a>Chapter3.Using Slapos in the Windows</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#sec_configure_slapos">3.1. Configure SlapOS</a></span></dt><dt><span class="section"><a href="#id9256148">3.2. SlapOS Node</a></span></dt><dt><span class="section"><a href="#id9256169">3.3. SlapOS</a></span></dt><dt><span class="section"><a href="#id9256184">3.4. SlapOS Runner</a></span></dt><dt><span class="section"><a href="#id9256208">3.5. Command Console</a></span></dt><dt><span class="section"><a href="#id9256241">3.6. User Guide</a></span></dt><dt><span class="section"><a href="#id9256250">3.7. Cron Service</a></span></dt><dt><span class="section"><a href="#id9256274">3.8. Known issues</a></span></dt></dl></div><p>After SlapOS has been installed successfully, you will find program group "SlapOS" which include the following entries:
 </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Configure SlapOS</p></li><li class="listitem"><p>SlapOS Node</p></li><li class="listitem"><p>SlapOS</p></li><li class="listitem"><p>SlapOS Runner</p></li><li class="listitem"><p>Command Console</p></li><li class="listitem"><p>User Guide</p></li></ul></div><p>
@@ -26,14 +26,14 @@ Next the configure script need certificate and key information:
 Then waiting for configure script finished. Be sure the configure scrip report successfully, otherwise fix the problem and run it again. You can run Slapos Configure at anytime, and netx time you needn't input anything, configure scripts just checks all the configuration and update the configure files.
 </p></div><div class="section" title="3.2.SlapOS Node"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256148"></a>3.2.SlapOS Node</h2></div></div></div><p>It's used to create instance of slapos webrunner, format slapos node, release software and create instance, you an run it at any time.</p><p>Click Start -&gt; SlapOS -&gt; SlapOS Node, if the current user isn't Administrator, Right click SlapOS Node, then Run As Administrator.</p><p>Be sure the scrip reports successfully, otherwise fix the problem and run it again.</p></div><div class="section" title="3.3.SlapOS"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256169"></a>3.3.SlapOS</h2></div></div></div><p>This is used by slapos client, now it's connected to <a class="ulink" href="https://www.slapos.org" target="_top">https://www.slapos.org</a>. Logon and enjoy the journey in the SlapOS Cloud world.</p></div><div class="section" title="3.4.SlapOS Runner"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256184"></a>3.4.SlapOS Runner</h2></div></div></div><p>SlapOS Runner is a web based development tool which uses slapgrid to install the software, and it could be used to manage your slapos slave node in your computer.</p><p>After installing slapos, Node Runner isn't available. You need run SlapOS Node first. After that, Node Runner would be available.</p><p>Refer to <a class="ulink" href="http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Howto.Use.SlapOS.Web.Runner.html5" target="_top">http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Howto.Use.SlapOS.Web.Runner.html5</a></p></div><div class="section" title="3.5.Command Console"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256208"></a>3.5.Command Console</h2></div></div></div><p>It will open a terminal, here you can run most of slapos command, for examples,
 </p><pre class="programlisting">
-slapos node foramt -cv --now
+slapos node format -cv --now
 slapos supply slaprunner COMP-1658
 slapos request "Jondy Web Runner In Windows 7" slaposwebrunner --node computer_guid=COMP-1658
 slapos node software
 slapos node instance
 slapos node status
 </pre><p>
-</p><p>For more information, refer to <a class="ulink" href="http://git.erp5.org/gitweb/slapos.core.git/blob/HEAD:/documentation/source/slapos.usage.rst?js=1" target="_top">http://git.erp5.org/gitweb/slapos.core.git/blob/HEAD:/documentation/source/slapos.usage.rst?js=1</a></p></div><div class="section" title="3.6.User Guide"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256241"></a>3.6.User Guide</h2></div></div></div><p>It just showes this documnet in the web browser.</p></div><div class="section" title="3.7.Cron Service"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256250"></a>3.7.Cron Service</h2></div></div></div><p>After run Configure SlapOS, a cron service will start in the background which used to release software and create instance periodically. Open Cygwin Terminal, type the following command to check cron jobs:
+</p><p>For more information, refer to <a class="ulink" href="http://git.erp5.org/gitweb/slapos.core.git/blob/HEAD:/documentation/source/slapos.usage.rst?js=1" target="_top">http://git.erp5.org/gitweb/slapos.core.git/blob/HEAD:/documentation/source/slapos.usage.rst?js=1</a></p></div><div class="section" title="3.6.User Guide"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256241"></a>3.6.User Guide</h2></div></div></div><p>It just shows this documnet in the web browser.</p></div><div class="section" title="3.7.Cron Service"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9256250"></a>3.7.Cron Service</h2></div></div></div><p>After run Configure SlapOS, a cron service will start in the background which used to release software and create instance periodically. Open Cygwin Terminal, type the following command to check cron jobs:
 </p><pre class="programlisting">
 # List all cron tabs
 crontab -l
@@ -260,9 +260,9 @@ patch -p1 &lt; /opt/git/slapos.package/windows/patches/psutil-0.6.2.patch
 python setup.py sdist
 </pre><p>
 Then upload the source packages dist/psutil-1.0.1.tar.gz to http://www.nexedi.org/static/packages/source/
-</p><p>Update egg netifaces, same as psutil, except use patch file netifaces-0.8-1-cygwin.patch</p></div><div class="section" title="6.2.How to upgrade installer"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257111"></a>6.2.How to upgrade installer</h2></div></div></div><p>Redo all the action in the chapter Generate Installer For Windows</p></div><div class="section" title="6.3.Merge sources to master branch"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257121"></a>6.3.Merge sources to master branch</h2></div></div></div><p>merge cygwin to master in the slapos.core.git</p><p>merge cygwin to master in the slapos.package.git</p><p>merge cygwin-share to master in the slapos.git</p><p>merge cygwin to master in the re6stnet.git</p></div></div><div class="chapter" title="Chapter7.Create SlapOS Windows Installer Bootstrip Node"><div class="titlepage"><div><div><h2 class="title"><a name="id9257144"></a>Chapter7.Create SlapOS Windows Installer Bootstrip Node</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id9257187">7.1. Add SlapOS Bootstrip Node to Vifib Cluster</a></span></dt></dl></div><p>This chapter descripts how to create a slapos node in the windows which used to test the windows installer self:
-</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Install cygwin</p></li><li class="listitem"><p>Prepare certificate, key, computer.key, computer.crt and test-computer.key, test-computer.crt</p></li><li class="listitem"><p>Run slapos-cygwin-bootstrip.sh, got it from slapos.package.git/windows/scripts</p></li><li class="listitem"><p>Run command slapos node software/release until instance created</p></li><li class="listitem"><p>Run command slapos remove to destroy this instance</p></li></ul></div><p>
-</p><div class="section" title="7.1.Add SlapOS Bootstrip Node to Vifib Cluster"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257187"></a>7.1.Add SlapOS Bootstrip Node to Vifib Cluster</h2></div></div></div><p>Create an instance of SlapOS Test-Agent in slapos bootstrip node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</p><p>Create another instance of SlapOS Test-Agent used to test the instances running in the slapos test node (test-computer.key/test-computer.crt). This test agent can include any software which can run in the slapos windows.</p></div></div><div class="appendix" title="AppendixA.Cygwin Required Packages List"><div class="titlepage"><div><div><h2 class="title"><a name="appendix_cygwin_packages"></a>AppendixA.Cygwin Required Packages List</h2></div></div></div><p>The following packages are requied by SlapOS Node
+</p><p>Update egg netifaces, same as psutil, except use patch file netifaces-0.8-1-cygwin.patch</p></div><div class="section" title="6.2.How to upgrade installer"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257111"></a>6.2.How to upgrade installer</h2></div></div></div><p>Redo all the action in the chapter Generate Installer For Windows</p></div><div class="section" title="6.3.Merge sources to master branch"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257121"></a>6.3.Merge sources to master branch</h2></div></div></div><p>merge cygwin to master in the slapos.core.git</p><p>merge cygwin to master in the slapos.package.git</p><p>merge cygwin-share to master in the slapos.git</p><p>merge cygwin to master in the re6stnet.git</p></div></div><div class="chapter" title="Chapter7.Create SlapOS Windows Installer Bootstrap Node"><div class="titlepage"><div><div><h2 class="title"><a name="id9257144"></a>Chapter7.Create SlapOS Windows Installer Bootstrap Node</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id9257187">7.1. Add SlapOS Bootstrap Node to Vifib Cluster</a></span></dt></dl></div><p>This chapter descripts how to create a slapos node in the windows which used to test the windows installer self:
+</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Install cygwin</p></li><li class="listitem"><p>Prepare certificate, key, computer.key, computer.crt and test-computer.key, test-computer.crt</p></li><li class="listitem"><p>Run slapos-cygwin-bootstrap.sh, got it from slapos.package.git/windows/scripts</p></li><li class="listitem"><p>Run command slapos node software/release until instance created</p></li><li class="listitem"><p>Run command slapos remove to destroy this instance</p></li></ul></div><p>
+</p><div class="section" title="7.1.Add SlapOS Bootstrap Node to Vifib Cluster"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id9257187"></a>7.1.Add SlapOS Bootstrap Node to Vifib Cluster</h2></div></div></div><p>Create an instance of SlapOS Test-Agent in slapos bootstrap node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</p><p>Create another instance of SlapOS Test-Agent used to test the instances running in the slapos test node (test-computer.key/test-computer.crt). This test agent can include any software which can run in the slapos windows.</p></div></div><div class="appendix" title="AppendixA.Cygwin Required Packages List"><div class="titlepage"><div><div><h2 class="title"><a name="appendix_cygwin_packages"></a>AppendixA.Cygwin Required Packages List</h2></div></div></div><p>The following packages are requied by SlapOS Node
 </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Devel/autobuild</p></li><li class="listitem"><p>Devel/autoconf</p></li><li class="listitem"><p>Devel/automake</p></li><li class="listitem"><p>Net/autossh</p></li><li class="listitem"><p>Devel/binutils</p></li><li class="listitem"><p>Devel/bison</p></li><li class="listitem"><p>Utils/bzip2<sup></sup></p></li><li class="listitem"><p>Net/ca-certificates</p></li><li class="listitem"><p>Admin/cron</p></li><li class="listitem"><p>Net/curl</p></li><li class="listitem"><p>Devel/cygport</p></li><li class="listitem"><p>Admin/cygrunsrv</p></li><li class="listitem"><p>Utils/file<sup>*</sup></p></li><li class="listitem"><p>Devel/flex</p></li><li class="listitem"><p>Devel/gcc4</p></li><li class="listitem"><p>Utils/gdbm</p></li><li class="listitem"><p>Devel/libgdbm-devel</p></li><li class="listitem"><p>Devel/gettext<sup>*</sup></p></li><li class="listitem"><p>Devel/gettext-devel</p></li><li class="listitem"><p>Devel/git</p></li><li class="listitem"><p>GNOME/libglib2.0-devel</p></li><li class="listitem"><p>GNOME/libglib2.0_0</p></li><li class="listitem"><p>Libs/libexpat1</p></li><li class="listitem"><p>Libs/libexpat1-devel</p></li><li class="listitem"><p>Libs/libmpfr-devel</p></li><li class="listitem"><p>Libs/libmpfr4</p></li><li class="listitem"><p>Libs/libsqlite3-devel</p></li><li class="listitem"><p>Libs/libsqlite3_0</p></li><li class="listitem"><p>Devel/libtool</p></li><li class="listitem"><p>Devel/libwrap-devel</p></li><li class="listitem"><p>Libs/libxml2</p></li><li class="listitem"><p>Libs/libxml2-devel</p></li><li class="listitem"><p>Libs/libxslt</p></li><li class="listitem"><p>Libs/libxslt-devel</p></li><li class="listitem"><p>Devel/make</p></li><li class="listitem"><p>Interpreters/m4</p></li><li class="listitem"><p>Devel/libncurses-devel</p></li><li class="listitem"><p>Devel/libncursesw-devel</p></li><li class="listitem"><p>Utils/patch</p></li><li class="listitem"><p>Utils/patchutils</p></li><li class="listitem"><p>Devel/pkg-config</p></li><li class="listitem"><p>Python/python<sup>2.7</sup></p></li><li class="listitem"><p>Python/python-openssl</p></li><li class="listitem"><p>Python/python-setuptools</p></li><li class="listitem"><p>Net/openssh</p></li><li class="listitem"><p>Devel/openssl-devel</p></li><li class="listitem"><p>Libs/libopenssl098</p></li><li class="listitem"><p>Libs/libopenssl100</p></li><li class="listitem"><p>Libs/popt</p></li><li class="listitem"><p>Devel/readline<sup>*</sup></p></li><li class="listitem"><p>Database/sqlite3</p></li><li class="listitem"><p>Devel/swig</p></li><li class="listitem"><p>Admin/syslog-ng</p></li><li class="listitem"><p>Devel/zlib-devel</p></li><li class="listitem"><p>Editor/vim</p></li><li class="listitem"><p>Web/wget</p></li></ul></div><p>
 </p><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"><a name="package-docbook-utils"></a>Note</h3><p>
 There is another package: Text/docbook-utils, it only used to generate user-guide.html from source file. But this package will increase required disk size remarkable, because many dependent packages are installed by Cygwin, so it recommand not to check this package when building slapos source or the installer. Only you really need to build the document, then install this package from cygwin setup gui interface by double clicking setup.exe downloaded from cygwin.com</p></div><p>

windows/docs/using-slapos-in-windows.xml

@@ -12,7 +12,7 @@
        <revnumber>0.4</revnumber>
        <date>2013-08-01</date>
        <authorinitials>Jondy Zhao - jondy.zhao@nexedi.com</authorinitials>
-       <revremark>Add chapter Create SlapOS Windows Installer Bootstrip Node.</revremark>
+       <revremark>Add chapter Create SlapOS Windows Installer Bootstrap Node.</revremark>
      </revision>
 
      <revision>
@@ -126,7 +126,7 @@ Then waiting for configure script finished. Be sure the configure scrip report s
 <section><title>Command Console</title>
 <para>It will open a terminal, here you can run most of slapos command, for examples,
 <programlisting>
-slapos node foramt -cv --now
+slapos node format -cv --now
 slapos supply slaprunner COMP-1658
 slapos request "Jondy Web Runner In Windows 7" slaposwebrunner --node computer_guid=COMP-1658
 slapos node software
@@ -138,7 +138,7 @@ slapos node status
 </section>
 
 <section><title>User Guide</title>
-<para>It just showes this documnet in the web browser.</para>
+<para>It just shows this documnet in the web browser.</para>
 </section>
 
 <section><title>Cron Service</title>
@@ -486,19 +486,19 @@ Then upload the source packages dist/psutil-1.0.1.tar.gz to http://www.nexedi.or
 </section>
 </chapter>
 
-<chapter><title>Create SlapOS Windows Installer Bootstrip Node</title>
+<chapter><title>Create SlapOS Windows Installer Bootstrap Node</title>
 <para>This chapter descripts how to create a slapos node in the windows which used to test the windows installer self:
 <itemizedlist>
 <listitem><para>Install cygwin</para></listitem>
 <listitem><para>Prepare certificate, key, computer.key, computer.crt and test-computer.key, test-computer.crt</para></listitem>
-<listitem><para>Run slapos-cygwin-bootstrip.sh, got it from slapos.package.git/windows/scripts</para></listitem>
+<listitem><para>Run slapos-cygwin-bootstrap.sh, got it from slapos.package.git/windows/scripts</para></listitem>
 <listitem><para>Run command slapos node software/release until instance created</para></listitem>
 <listitem><para>Run command slapos remove to destroy this instance</para></listitem>
 </itemizedlist>
 </para>
 
-<section><title>Add SlapOS Bootstrip Node to Vifib Cluster</title>
-<para>Create an instance of SlapOS Test-Agent in slapos bootstrip node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</para>
+<section><title>Add SlapOS Bootstrap Node to Vifib Cluster</title>
+<para>Create an instance of SlapOS Test-Agent in slapos bootstrap node (computer.key/computer.crt), it will test the software: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/slapos-windows-installer/software.cfg, this software can build slapos windows installer, then run the installer to create a slapos test node.</para>
 <para>Create another instance of SlapOS Test-Agent used to test the instances running in the slapos test node (test-computer.key/test-computer.crt). This test agent can include any software which can run in the slapos windows.</para>
 </section>
 </chapter>

windows/ipwin/ipwin/ReadMe.txt

 How to build for x86:
 
-Open ipwin.vcproj in the Microsoft Visual Studio 2008, Press F7
+Open ipwin.vcproj in Microsoft Visual Studio 2008, Press F7
 
 How to build for x64:
 

windows/ipwin/ipwin/netcfg.cpp

@@ -429,7 +429,7 @@ HRESULT SlaposNetCfgWinRenameConnection (LPWSTR pGuid, PCWSTR NewName)
   lpHrRenameConnection RenameConnectionFunc = NULL;
   HRESULT status;
 
-  /* First try the IShellFolder interface, which was unimplemented
+  /* First try the IShellFolder interface, which was not implemented
    * for the network connections folder before XP. */
   status = rename_shellfolder (pGuid, NewName);
   if (status == E_NOTIMPL)

windows/netreport/setup.py

@@ -39,7 +39,7 @@ def main():
     setup_args = dict(
         name='netdrive',
         version=VERSION,
-        description='A tool used to report the usage of net drive in the Windows',
+        description='A tool used to report the usage of net drive in Windows',
         long_description=get_description(),
         keywords=['netdrive',],
         py_modules=['netreport'],

windows/netreport/src/netuse.c

@@ -91,21 +91,21 @@ netuse_user_info(PyObject *self, PyObject *args)
       logonuser = userinfo;
       len = wchar2mchar(pBuf->wkui1_username, logonuser, size);
       if (len == -1) {
-        PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
+        PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
         return NULL;
       }
       size -= len;
       logondomain = logonuser + len;
       len = wchar2mchar(pBuf->wkui1_logon_domain, logondomain, size);
       if (len == -1) {
-        PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
+        PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
         return NULL;
       }
       size -= len;
       logonserver = logondomain + len;
       len = wchar2mchar(pBuf->wkui1_logon_server, logonserver, size);
       if (len == -1) {
-        PyErr_SetString(PyExc_RuntimeError, "Unicode convertion error");
+        PyErr_SetString(PyExc_RuntimeError, "Unicode conversion error");
         return NULL;
       }
     }
@@ -163,7 +163,7 @@ netuse_map_drive(PyObject *self, PyObject *args)
   drive[0] = get_free_drive_letter();
   if (!drive[0]) {
     PyErr_SetString(PyExc_RuntimeError,
-                    "Add net drive faild: no available drive letter."
+                    "Add net drive failed: no available drive letter."
                     );
     return NULL;
   }
@@ -403,7 +403,7 @@ PyMODINIT_FUNC initnetuse(void)
   PyObject* module;
   module = Py_InitModule3("netuse",
                           NetUseMethods,
-                          "Show information about net resource in the Windows."
+                          "Show information about net resource in Windows."
                           );
 
   if (module == NULL)

windows/scripts/ip

@@ -25,8 +25,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ------------------------------------------------------------------------------
-# Simulate the linux command "ip" in the Windows. Most of functions
-# are mapped to windows command "netsh". Refer to ip man in the linux
+# Simulate the linux command "ip" in Windows. Most of functions
+# are mapped to windows command "netsh". Refer to ip man in linux
 # to know how to use this command.
 #
 # Synopsis (not all of options are implemented here),
@@ -408,7 +408,7 @@ while [[ "$1" != "" ]] && [[ "$object" == "" ]] ; do
         maddr | mroute | monitor | tuntap | vpntap)
             object=$1
             ;;
-        *) echo Warning: unsupport options "$1"
+        *) echo Warning: unsupported options "$1"
     esac
 
     shift
@@ -428,7 +428,7 @@ fi
 command=$1; shift
 if [[ "$command" == "" ]] ; then
     echo $orig_cmd
-    echo "Error: missing command paramter."
+    echo "Error: missing command parameter."
     exit 1
 fi
 
@@ -468,7 +468,7 @@ elif [[ $object == "addr" ]] ; then
                 dev=$(format_interface_name "$2")
                 shift
                 ;;
-            *) echo Warning: unsupport parameter "$1"
+            *) echo Warning: unsupported parameter "$1"
         esac
 
         shift
@@ -601,7 +601,7 @@ elif [[ $object == "route" ]] ; then
                 table="$2"
                 shift
                 ;;
-            *) echo "Warning: unsupport parameter \"$1\" in the Cygwin"
+            *) echo "Warning: unsupported parameter \"$1\" in Cygwin"
         esac
 
         shift;
@@ -610,7 +610,7 @@ elif [[ $object == "route" ]] ; then
     if [[ "$unreachable" == "1" ]] ; then
         if [[ "$opt_family" == "ipv4" || "$opt_family" == "" ]] ; then
             echo $orig_cmd
-            echo "Error: unreachable ipv4 route entry is unimplemented"
+            echo "Error: unreachable ipv4 route entry is not implemented"
             exit 1
         else
             if [[ "$command" == "del" ]] ; then
@@ -671,7 +671,7 @@ elif [[ $object == "vpntap" || $object == "tuntap" ]] ; then
                 mode=$2
                 shift
                 ;;
-            *) echo Warning: unsupport parameter "$1"
+            *) echo Warning: unsupported parameter "$1"
         esac
 
         shift
@@ -689,26 +689,26 @@ elif [[ $object == "vpntap" || $object == "tuntap" ]] ; then
         exit 1
     fi
 # elif [[ $object == "rule" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 # elif [[ $object == "neigh" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 # elif [[ $object == "tunnel" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 # elif [[ $object == "maddr" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 # elif [[ $object == "mroute" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 # elif [[ $object == "monitor" ]] ; then
-#     echo "Error: unsupported ip object \"$object\" in the Cygwin"
+#     echo "Error: unsupported ip object \"$object\" in Cygwin"
 #     exit 1
 else
     echo $orig_cmd
-    echo "Error: unsupported ip object \"$object\" in the Cygwin"
+    echo "Error: unsupported ip object \"$object\" in Cygwin"
     exit 1
 fi
 

windows/scripts/register-node.sh

@@ -90,9 +90,9 @@ if [[ ! -d ~/.slapos ]] ; then
 fi
 
 if [[ ! ( -f ~/.slapos/certificate && -f ~/.slapos/key ) ]] ; then
-    echo "Error: missing certificate and key in the ~/.slapos  \
+    echo "Error: missing certificate and key in ~/.slapos  \
 
-If you haven't an account in the slapos.org, please login https://www.slapos.org and signup. Otherwise to be sure both of files are stored in the ~/.slapos 
+If you don't have an account in slapos.org, please login to https://www.slapos.org and signup. Otherwise check that both files are stored in ~/.slapos 
 "
     exit 1
 fi
@@ -105,7 +105,7 @@ master_url = https://slap.vifib.com/
 [slapconsole]
 # Put here retrieved certificate from vifib.
 # Beware: put certificate from YOUR account, not the one from your node.
-# You (as identified person from vifib) will request an instance, node your node.
+# You (as identified person from vifib) will request an instance, not your node.
 # Conclusion: node certificate != person certificate.
 cert_file = ~/.slapos/certificate
 key_file = ~/.slapos/key
@@ -126,18 +126,18 @@ bin/slapos node register $nodename
 # Check computer configure file: /etc/opt/slapos/slapos.cfg
 nodecfg=/etc/opt/slapos/slapos.cfg
 if [[ ! -f $nodecfg ]] ; then
-    echo Error: something is wrong when register node. Can not find the configure file $nodecfg.
+    echo Error: something is wrong when registering the node. Cannot find the configuration file $nodecfg.
     exit 1
 fi
 
 # check ipv6
 netsh interface ipv6 show interface > /dev/null || netsh interface ipv6 install
 
-# get GUID of the first physics netcard
+# get GUID of the first physical netcard
 guidname=get_all_physical_netcard
 
 if [[ "$guidname" == "" ]] ; then
-    echo Error: no any physical netcard found.
+    echo Error: no physical netcard found.
     exit 1
 fi
 
@@ -150,9 +150,9 @@ sed -i  -e "s/^\\s*interface_name.*$/interface_name = ${IPINTERFACE}/g" \
        $nodecfg
 
 # 
-# Add run item when windows startup
+# Add run item at windows startup
 echo Set slapos init script as Windows startup item.
 regtool -q set "$RUNKEY\\$SLAPOSNODEINIT" "\"$(cygpath -w /usr/bin/sh)\" --login -i /etc/slapos/scripts/init-slapos-node.sh"
-(( $? )) && echo Fail to set init script as startup item.
+(( $? )) && echo Failed to set init script as startup item.
 
 

windows/scripts/slap-runner.html

 <html> 
 <head><title>SlapOS Webrunner</title></head> 
-<body>Sorry, SlapOS Web Runner isn't installed now. Please run SlapOS Node at first by clicking Start -> SlapOS -> SlapOS Node. Be sure to run it as Administrator in the Windows 7.</body>
+<body>Sorry, SlapOS Web Runner is not installed now. Please run SlapOS Node first by clicking Start -> SlapOS -> SlapOS Node. Be sure to run it as Administrator in Windows 7.</body>
 </html>

windows/scripts/slapos-configure.sh

@@ -51,7 +51,7 @@ function show_usage()
     echo "    The configure item option:"
     echo ""
     echo "        *              All the configure item"
-    echo "        re6stnet       Install re6stent and dependencies"
+    echo "        re6stnet       Install re6stnet and dependencies"
     echo "        config         Generate slapos node and client configure files"
     echo "        cron           Generate cron file and start cron job"
     echo ""
@@ -155,7 +155,7 @@ mkdir -p /etc/re6stnet
 # -----------------------------------------------------------
 # Create account: slaproot
 # -----------------------------------------------------------
-# Start seclogon service in the Windows XP
+# Start seclogon service in Windows XP
 if csih_is_xp ; then
     csih_inform "Set start property of seclogon to auto"
     sc config seclogon start= auto ||
@@ -342,7 +342,7 @@ csih_inform "  user_base_name:     ${slapos_user_basename}"
 csih_inform
 csih_inform "  If ipv4_local_network confilcts with your local network, change it"
 csih_inform "  in the file: ${node_configure_file} "
-csih_inform "  Or change it in the $(dirname $0)/slapos-include.sh"
+csih_inform "  Or change it in $(dirname $0)/slapos-include.sh"
 csih_inform "  and run Configure SlapOS again."
 
 sed -i  -e "s%^\\s*interface_name.*$%interface_name = ${interface_guid}%" \
@@ -518,7 +518,7 @@ if check_re6stnet_needed ; then
             -u ${_administrator} -w ${csih_PRIVILEGED_PASSWORD} ||
         csih_error "Failed to install ${re6stnet_service_name} service."
     fi
-    csih_inform "you can check log files in the /var/log/re6stnet/*.log"
+    csih_inform "you can check log files in /var/log/re6stnet/*.log"
     if ! check_cygwin_service ${re6stnet_service_name} ; then
         csih_inform "Service ${re6stnet_service_name} is not running. One possible case"
         csih_inform "is that re6stnet service is shutdown in unusual ways, in this case"
@@ -596,7 +596,7 @@ echo ""
 # echo
 
 echo ""
-csih_inform "Configure SlapOS successfully"
+csih_inform "SlapOS has been successfully configured"
 echo ""
 
 read -n 1 -t 60 -p "Press any key to exit..."

windows/scripts/slapos-cron-config

@@ -148,8 +148,8 @@ get_NT() {
 # ======================================================================
 warning_for_etc_file() {
 	echo
-	echo "WARNING: The command above overwrites any existing /etc/$1."
-	echo "You may want to preserve /etc/$1 before generating a new,"
+	echo "WARNING: The above command overwrites any existing /etc/$1."
+	echo "You may want to preserve /etc/$1 before generating a new"
 	echo "one, and then compare your saved /etc/$1 file with the"
 	echo "newly-generated one in case you need to restore other"
 	echo "entries."
@@ -590,13 +590,13 @@ create_user() {
     else
         username_in_sam=
 	echo "User ${username} needs a password. It must match"
-	echo "the rules in force on your system."
+	echo "the rules enforced by your system."
 	getvalue "Please enter the password for ${username}:" -s
 	_password="${value}"
 	echo
 	net user "${username}" "${_password}" /add /fullname:"Privileged server" /yes > "$TEMP_FILE" 2>&1 && username_in_sam=yes
 	if [ "${username_in_sam}" != "yes" ]; then
-	    echo "ERROR: Creating the user '${username}' failed!  Reason:"
+	    echo "ERROR: Creation of user '${username}' failed!  Reason:"
 	    cat "$TEMP_FILE"
 	    rm -f "$TEMP_FILE"
 	    echo

windows/scripts/slapos-cygwin-bootstrip.sh → windows/scripts/slapos-cygwin-bootstrap.sh

@@ -8,16 +8,16 @@ readonly -f check_os_is_wow64
 
 function show_usage()
 {
-    echo "This script is used to build a bootstrip slapos in the cywin."
+    echo "This script is used to build a bootstrap slapos in cywin."
     echo ""
     echo "Usage:"
     echo ""
-    echo "  ./slapos-cygwin-bootstrip.sh"
+    echo "  ./slapos-cygwin-bootstrap.sh"
     echo ""
     echo "Before run this script, type the following command in the windows"
     echo "command console to install cygwin:"
     echo ""
-    echo "  setup_cygwin.bat C:\slapos-bootstrip network"
+    echo "  setup_cygwin.bat C:\slapos-bootstrap network"
     echo ""
     echo "Then sign up slapos.org, got the following certificate files:"
     echo ""
@@ -43,7 +43,7 @@ if ! source /usr/share/csih/cygwin-service-installation-helper.sh ; then
     exit 1
 fi
 
-csih_inform "Starting bootstrip slapos node ..."
+csih_inform "Starting bootstrap slapos node ..."
 echo ""
 
 # ======================================================================
@@ -277,7 +277,7 @@ echo ""
 # -----------------------------------------------------------
 # Format slapos node
 # -----------------------------------------------------------
-csih_inform "Formating SlapOS Node ..."
+csih_inform "Formatting SlapOS Node ..."
 
 netsh interface ipv6 add addr ${slapos_ifname} ${ipv6_local_address}
 /opt/slapos/bin/slapos node format -cv --now ||
@@ -319,7 +319,7 @@ while true ; do
 done
 
 echo ""
-csih_inform "Bootstrip slapos node successfully."
+csih_inform "Bootstrap slapos node successfully."
 echo ""
 
 read -n 1 -t 60 -p "Press any key to exit..."

windows/scripts/slapos-include.sh

@@ -10,7 +10,7 @@ fi
 csih_get_system_and_admins_ids
 if [[ ! " $(id -G) " == *\ $csih_ADMINSUID\ * ]] ; then
     echo
-    echo "You haven't right to run this script. "
+    echo "You don't have the rights to run this script. "
     echo "Please login as Administrator to run it, or right-click this script"
     echo "then click Run as administrator."
     echo
@@ -124,7 +124,7 @@ function check_node_configure()
 # ======================================================================
 function check_client_configure()
 {
-    csih_inform "Checking slapos client confiure ..."
+    csih_inform "Checking slapos client configure ..."
     [[ -f ${client_configure_file} ]] ||
     csih_error "Missing client configure file: ${client_configure_file}"
     csih_inform "Check slapos client configure Over."
@@ -136,7 +136,7 @@ function check_client_configure()
 # ======================================================================
 function check_cron_configure()
 {
-    csih_inform "Checking slapos cron confiure ..."
+    csih_inform "Checking slapos cron configure ..."
     csih_inform "Check slapos cron configure Over."
 }  # === check_cron_configure() === #
 
@@ -146,7 +146,7 @@ function check_cron_configure()
 # ======================================================================
 function check_re6stnet_configure()
 {
-    csih_inform "Checking slapos re6stnet confiure ..."
+    csih_inform "Checking slapos re6stnet configure ..."
     which re6stnet > /dev/null 2>&1 ||
     csih_error "No re6stnet installed, please run Configure SlapOS first."
     csih_inform "Check slapos re6stnet configure Over."
@@ -158,7 +158,7 @@ function check_re6stnet_configure()
 # ======================================================================
 function check_re6stnet_needed()
 {
-    # This doesn't work in the cygwin now, need hack ip script
+    # This doesn't work in cygwin now, need hack ip script
     # re6st-conf --registry http://re6stnet.nexedi.com/ --is-needed
     if netsh interface ipv6 show route | grep -q " ::/0 " ; then
         return 1
@@ -298,15 +298,15 @@ slapos_check_and_create_privileged_user()
               if [ -z "${_password}" ]
               then
                   csih_error_multi "Exiting configuration.  No user ${username} has been created," \
-                      "and no services have been installed."
+                      "and no service has been installed."
               fi
           fi
           tmpfile1=$(csih_mktemp) || csih_error "Could not create temp file"
-          csih_call_winsys32 net user "${username}" "${_password}" /add /fullname:"SlapOS Administraoter" \
+          csih_call_winsys32 net user "${username}" "${_password}" /add /fullname:"SlapOS Administrator" \
               "/homedir:${dos_var_empty}" /yes > "${tmpfile1}" 2>&1 && username_in_sam=yes
           if [ "${username_in_sam}" != "yes" ]
           then
-              csih_warning "Creating the user '${username}' failed!  Reason:"
+              csih_warning "Creation of user '${username}' failed!  Reason:"
               /usr/bin/cat "${tmpfile1}"
               echo
           fi
@@ -469,7 +469,7 @@ function openwin() {
 EOF
         fi
     else
-        csih_error_multi "Request return true, but I can't find connection information," \
+        csih_error_multi "Request returned true, but I can't find connection information," \
             "something is wrong with slapos webrunner software."
     fi
     return ${_ret}

windows/scripts/slapos-node.sh

@@ -50,7 +50,7 @@ fi
 # -----------------------------------------------------------
 # Format slapos node
 # -----------------------------------------------------------
-csih_inform "Formating SlapOS Node ..."
+csih_inform "Formatting SlapOS Node ..."
 /opt/slapos/bin/slapos node format -cv --now ||
 csih_error "Run slapos node format failed. "
 

windows/scripts/useradd

@@ -49,8 +49,8 @@ fi
 csih_get_system_and_admins_ids
 if [[ ! " $(id -G) " == *\ $csih_ADMINSUID\ * ]] ; then
     echo
-    echo "Note that creating a new user requires that the current account have"
-    echo "Administrator privileges.  You haven't right to run this script. "
+    echo "Note that creating a new user requires that the current account has"
+    echo "Administrator privileges.  You don't have the rights to run this script. "
     echo "Please login as Administrator, or right-click this script"
     echo "then click Run as administrator."
     echo
@@ -96,7 +96,7 @@ function create_unprivileged_user()
           "/homedir:${dos_var_empty}" /active:no > /dev/null 2>&1 && unpriv_user_in_sam=yes
         if [ "${unpriv_user_in_sam}" != "yes" ]
         then
-          csih_warning "Creating the user '${unpriv_user}' failed!"
+          csih_warning "Creation of user '${unpriv_user}' failed!"
         fi
     fi
     if [ "${unpriv_user_in_sam}" = "yes" ]
@@ -177,7 +177,7 @@ while getopts "Dd:g:G:p:s:r" opt ; do
         r)
             ;;
         *)
-            echo Error when add user in the Cygwin
+            echo Error while adding user in Cygwin
             exit 1
             ;;
     esac
@@ -201,5 +201,5 @@ for grpname in ${USER_INIT_GROUP} ${USER_OTHER_GROUP} ; do
 done
 
 # net user "${USER_NAME}" /delete ||
-# (echo "Faild to delete user ${USER_NAME}" ; exit 1)
+# (echo "Failed to delete user ${USER_NAME}" ; exit 1)
 # sed -i -e "/^${USER_NAME}/d" /etc/passwd

windows/scripts/usermod

@@ -59,7 +59,7 @@ while getopts "Dd:g:G:p:s:r" opt ; do
         r)
             ;;
         *)
-            echo Error when add user in the Cygwin
+            echo Error while adding user in Cygwin
             exit 1
             ;;
     esac