Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	view/nl/messages.po
	view/nl/strings.php

3 files changed, 51 insertions, 4 deletions

diff --git a/doc/Primary-Directory b/doc/Primary-Directory
new file mode 100644
index 000000000..37b0c0431
--- /dev/null
+++ b/doc/Primary-Directory
@@ -0,0 +1,47 @@
+#Primary Directory#
+
+By default, $Projectname will use available Directories on the web, which show you channels available around the world.
+
+There are certain scenarios where you might want your own directory-server that you can connect multiple hubs to. This will limit the channels that appear in all of your hubs to only channels on hubs connected to your directory-server.
+
+
+
+##Instuctions on how to set up one hub as the Primary Directory for a series of private hubs.##
+***
+
+
+*   On the hub that will be the Directory Server, open the .htconfig.php file and set:
+
+    `$a->config['system']['directory_mode'] = DIRECTORY_MODE_PRIMARY;`
+
+
+    By default it should already be set as **DIRECTORY_MODE_NORMAL**, so just edit that line to say **DIRECTORY_MODE_PRIMARY**
+
+*   Next, for each hub (including the Directory Server), from a terminal,  cd into the folder where it is installed and run this :
+
+    `util/config system directory_realm YOURREALMNAME`
+
+    (**YOURREALMNAME** can be whatever you want your realm-name to be)
+
+    then:
+
+    `util/config system realm_token THEPASSWORD`
+    
+    (**THEPASSWORD** is whatever password you want for your realm)
+
+    **NOTE:** Use the same realm-name and password for each hub
+
+*   Lastly, for each "client" hub, (from a terminal) run:
+
+    `util/config system directory_server https://theaddressofyourdirectoryserver.com`
+
+***
+Now when you view the directory of each hub, it should only show the channels that exist on the hubs in your realm. I have tested with two hubs so far, and it seems to be working fine.
+Channels created in each hub are reflected in the Primary Directory, and subsequently in the directory of all client hubs
+
+##Issues##
+***
+
+When I created the first hub,it was up and running for an hour or so before I changed it to PRIMARY_MODE, and after changing it, there were a few channels from across the matrix still present in the directory. I deleted them from the xchan table and that seems to have fixed the issue. 
+
+
diff --git a/doc/developers.bb b/doc/developers.bb
index eccf991ab..e9dddc695 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -1,4 +1,4 @@
-[b]Red Developer Guide[/b]

+[b]$Projectname Developer Guide[/b]

 

 We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine.  

 

@@ -39,7 +39,7 @@ All code contributed to the project falls under the MIT license, unless otherwis
 

 Code changes which fix an obvious bug are pretty straight-forward. For instance if you click "Save" and the thing you're trying to save isn't saved, it's fairly obvious what the intended behaviour should be. Often when developing feature requests, it may affect large numbers of community members and it's possible that other members of the community won't agree with the need for the feature, or with your proposed implementation. They may not see something as a bug or a desirable feature.

 

-We encourage concensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to [url=https://zothub.com/channel/one]Channel One[/url]. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. 

+We encourage consensus building within the community when it comes to any feature which might be considered controversial or where there isn't unanimous decision that the proposed feature is the correct way to accomplish the task. The first place to pitch your ideas is to [url=https://zothub.com/channel/one]Channel One[/url]. Others may have some input or be able to point out facets of your concept which might be problematic in our environment. But also, you may encounter opposition to your plan. This doesn't mean you should stop and/or ignore the feature. Listen to the concerns of others and try and work through any implementation issues. 

 

 There are places where opposition cannot be resolved. In these cases, please consider making your feature [b]optional[/b] or non-default behaviour that must be specifically enabled. This technique can often be used when a feature has significant but less than unanimous support. Those who desire the feature can turn it on and those who don't want it - will leave it turned off.

 

diff --git a/doc/features.bb b/doc/features.bb
index 8d51d9853..e8d1cd687 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -191,8 +191,8 @@ Similar to any other modern blogging system, social network, or a micro-blogging
 [b]Previewing/Editing[/b] 

 Post can be previewed prior to sending and edited after sending.

 

-[b]Voting/Concensus[/b]

-Posts can be turned into "concensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys. 

+[b]Voting/Consensus[/b]

+Posts can be turned into "consensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys. 

 

 

 [b]Extending $Projectname[/b]