diff options
Diffstat (limited to 'doc/handbook/chapters')
-rw-r--r-- | doc/handbook/chapters/developer.texi | 8 | ||||
-rw-r--r-- | doc/handbook/chapters/user.texi | 16 |
2 files changed, 13 insertions, 11 deletions
diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi index 3225a6359..b725f4111 100644 --- a/doc/handbook/chapters/developer.texi +++ b/doc/handbook/chapters/developer.texi | |||
@@ -556,7 +556,7 @@ stacked together to construct complex buildings and it is generally easy | |||
556 | to swap one block for a different one that has the same shape. GNUnet's | 556 | to swap one block for a different one that has the same shape. GNUnet's |
557 | architecture is based on LEGOs: | 557 | architecture is based on LEGOs: |
558 | 558 | ||
559 | @c @image{images/service_lego_block,5in,,picture of a LEGO block stack - 3 APIs as connectors upon Network Protocol on top of a Service} | 559 | @image{images/service_lego_block,5in,,picture of a LEGO block stack - 3 APIs upon IPC/network protocol provided by a service} |
560 | 560 | ||
561 | This chapter documents the GNUnet LEGO system, also known as GNUnet's | 561 | This chapter documents the GNUnet LEGO system, also known as GNUnet's |
562 | system architecture. | 562 | system architecture. |
@@ -573,10 +573,14 @@ Like services, they have holes to be filled by APIs of other services. | |||
573 | Unlike services, daemons do not implement their own network protocol and | 573 | Unlike services, daemons do not implement their own network protocol and |
574 | they have no API: | 574 | they have no API: |
575 | 575 | ||
576 | @image{images/daemon_lego_block,5in,,A daemon in GNUnet is a component that does not offer an API for others to build upon} | ||
577 | |||
576 | The GNUnet system provides a range of services, daemons and user | 578 | The GNUnet system provides a range of services, daemons and user |
577 | interfaces, which are then combined into a layered GNUnet instance (also | 579 | interfaces, which are then combined into a layered GNUnet instance (also |
578 | known as a peer). | 580 | known as a peer). |
579 | 581 | ||
582 | @image{images/service_stack,5in,,A GNUnet peer consists of many layers of services} | ||
583 | |||
580 | Note that while it is generally possible to swap one service for another | 584 | Note that while it is generally possible to swap one service for another |
581 | compatible service, there is often only one implementation. However, | 585 | compatible service, there is often only one implementation. However, |
582 | during development we often have a "new" version of a service in parallel | 586 | during development we often have a "new" version of a service in parallel |
@@ -587,7 +591,7 @@ easily investigated by swapping out individual components. This is | |||
587 | typically achieved by simply changing the name of the "BINARY" in the | 591 | typically achieved by simply changing the name of the "BINARY" in the |
588 | respective configuration section. | 592 | respective configuration section. |
589 | 593 | ||
590 | Key properties of GNUnet services are that they must be separate | 594 | Key properties of GNUnet services are that they must be separate |
591 | processes and that they must protect themselves by applying tight error | 595 | processes and that they must protect themselves by applying tight error |
592 | checking against the network protocol they implement (thereby achieving a | 596 | checking against the network protocol they implement (thereby achieving a |
593 | certain degree of robustness). | 597 | certain degree of robustness). |
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi index 55518bc34..1c78e8f48 100644 --- a/doc/handbook/chapters/user.texi +++ b/doc/handbook/chapters/user.texi | |||
@@ -526,7 +526,7 @@ shell) and create an entry home-phone in your master zone. | |||
526 | For the record type, select PHONE. You should then see the | 526 | For the record type, select PHONE. You should then see the |
527 | PHONE dialog: | 527 | PHONE dialog: |
528 | 528 | ||
529 | @c image here | 529 | @image{images/gnunet-namestore-gtk-phone,5in,,Dialog to publish a PHONE record} |
530 | 530 | ||
531 | Note: Do not choose the expiry time to be 'Never'. If you | 531 | Note: Do not choose the expiry time to be 'Never'. If you |
532 | do that, you assert that this record will never change and | 532 | do that, you assert that this record will never change and |
@@ -645,7 +645,7 @@ Now, using your normal user (not the @code{gnunet} system user), run | |||
645 | master zone. For the record type, select @code{VPN}. You should then | 645 | master zone. For the record type, select @code{VPN}. You should then |
646 | see the VPN dialog: | 646 | see the VPN dialog: |
647 | 647 | ||
648 | @c insert image | 648 | @image{images/gnunet-namestore-gtk-vpn,5in,,Dialog to publish a VPN record} |
649 | 649 | ||
650 | Under peer, you need to supply the peer identity of your own peer. You can | 650 | Under peer, you need to supply the peer identity of your own peer. You can |
651 | obtain the respective string by running @command{gnunet-peerinfo -sq} | 651 | obtain the respective string by running @command{gnunet-peerinfo -sq} |
@@ -1314,12 +1314,12 @@ To publish a file, select "File Sharing" in the menu bar just below the | |||
1314 | 1314 | ||
1315 | Afterwards, the following publishing dialog will appear: | 1315 | Afterwards, the following publishing dialog will appear: |
1316 | 1316 | ||
1317 | @c Add image here | 1317 | @image{images/gnunet-gtk-0-10-fs-publish,5in,,The gnunet-fs-gtk publishing dialog} |
1318 | 1318 | ||
1319 | In this dialog, select the "Add File" button. This will open a | 1319 | In this dialog, select the "Add File" button. This will open a |
1320 | file selection dialog: | 1320 | file selection dialog: |
1321 | 1321 | ||
1322 | @c Add image here | 1322 | @image{images/gnunet-gtk-0-10-fs-publish-select,5in,,Dialog to select the file to publish (looks may differ for other Gtk+ versions)} |
1323 | 1323 | ||
1324 | Now, you should select a file from your computer to be published on | 1324 | Now, you should select a file from your computer to be published on |
1325 | GNUnet. To see more of GNUnet's features later, you should pick a | 1325 | GNUnet. To see more of GNUnet's features later, you should pick a |
@@ -1335,12 +1335,12 @@ and potential errors that might be encountered during processing. | |||
1335 | After the progress dialog automatically disappears, your file | 1335 | After the progress dialog automatically disappears, your file |
1336 | should now appear in the publishing dialog: | 1336 | should now appear in the publishing dialog: |
1337 | 1337 | ||
1338 | @c Add image here | 1338 | @image{images/gnunet-gtk-0-10-fs-publish-with-file,5in,,Publishing dialog with file added} |
1339 | 1339 | ||
1340 | Now, select the file (by clicking on the file name) and then click | 1340 | Now, select the file (by clicking on the file name) and then click |
1341 | the "Edit" button. This will open the editing dialog: | 1341 | the "Edit" button. This will open the editing dialog: |
1342 | 1342 | ||
1343 | @c Add image here | 1343 | @image{images/gnunet-gtk-0-10-fs-publish-editing,5in,,Editing meta data of a file to be published} |
1344 | 1344 | ||
1345 | In this dialog, you can see many details about your file. In the | 1345 | In this dialog, you can see many details about your file. In the |
1346 | top left area, you can see meta data extracted about the file, | 1346 | top left area, you can see meta data extracted about the file, |
@@ -1364,9 +1364,7 @@ You should now be back at the "Publish content on GNUnet" dialog. Select | |||
1364 | "Execute" in the bottom right to close the dialog and publish your file | 1364 | "Execute" in the bottom right to close the dialog and publish your file |
1365 | on GNUnet! Afterwards, you should see the main dialog with a new area | 1365 | on GNUnet! Afterwards, you should see the main dialog with a new area |
1366 | showing the list of published files (or ongoing publishing operations | 1366 | showing the list of published files (or ongoing publishing operations |
1367 | with progress indicators): | 1367 | with progress indicators). |
1368 | |||
1369 | @c Add image here | ||
1370 | 1368 | ||
1371 | @node gtk-Searching | 1369 | @node gtk-Searching |
1372 | @subsubsection Searching | 1370 | @subsubsection Searching |