Merge branch 'master-terminology' into 'master'

general: Remove a few unhelpful references to ‘master’

See merge request GNOME/glib!792

docs/reference/gobject/tut_tools.xml

@@ -94,7 +94,7 @@ break g_object_unref if _object == 0xcafebabe
     libraries is built with a combination of complex tools. Typically, the part of 
     the documentation which describes the behavior of each function is extracted
     from the specially-formatted source code comments by a tool named gtk-doc which
-    generates DocBook XML and merges this DocBook XML with a set of master XML 
+    generates DocBook XML and merges this DocBook XML with a set of template XML
     DocBook files. These XML DocBook files are finally processed with xsltproc
     (a small program part of the libxslt library) to generate the final HTML
     output. Other tools can be used to generate PDF output from the source XML.

gio/gnetworkaddress.c

@@ -1108,7 +1108,7 @@ g_network_address_address_enumerator_next (GSocketAddressEnumerator  *enumerator
 
 /*
  * Each enumeration lazily initializes the internal address list from the
- * master list. It does this since addresses come in asynchronously and
+ * main list. It does this since addresses come in asynchronously and
  * they need to be resorted into the list already in use.
  */
 static GSocketAddress *

gio/tests/gapplication.c

@@ -140,7 +140,7 @@ basic (void)
 
   main_loop = g_main_loop_new (NULL, 0);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn ("activated\n"
          "open file:///a file:///b\n"
          "exit status: 0\n", NULL,
@@ -191,7 +191,7 @@ test_remote_command_line (void)
                          NULL);
   g_object_unref (file);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn (replies, NULL,
          "./cmd", NULL);
 
@@ -255,7 +255,7 @@ test_remote_actions (void)
 
   main_loop = g_main_loop_new (NULL, 0);
 
-  /* spawn the master */
+  /* spawn the main instance */
   spawn ("got ./cmd 0\n"
          "activate action1\n"
          "change action2 1\n"

gio/tests/socket-client.c

@@ -431,7 +431,7 @@ main (int argc,
     {
       if (!g_socket_close (socket, &error))
 	{
-	  g_printerr ("Error closing master socket: %s\n",
+	  g_printerr ("Error closing socket: %s\n",
 		      error->message);
 	  return 1;
 	}

gio/tests/socket-server.c

@@ -356,7 +356,7 @@ main (int argc,
 
   if (!g_socket_close (socket, &error))
     {
-      g_printerr ("Error closing master socket: %s\n",
+      g_printerr ("Error closing socket: %s\n",
 		  error->message);
       return 1;
     }